]> xenbits.xensource.com Git - xen.git/commitdiff
libxl: fix rc handling in libxl_device_usbdev_list
authorChunyan Liu <cyliu@suse.com>
Thu, 7 Apr 2016 09:40:25 +0000 (17:40 +0800)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 8 Apr 2016 13:30:09 +0000 (14:30 +0100)
In testing with libvirt pvusb functionality, found a rc check
error in libxl_device_usbdev_list. Correct it. This function
is not used by xl.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
CC: Simon Cao <caobosimon@gmail.com>
CC: George Dunlap <george.dunlap@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
tools/libxl/libxl_pvusb.c

index d04cb93fadbd321c1ad6ab04221fd5ca4d26d90d..f69792a12c706a51e3fbeb5a0036e9d68d080abe 100644 (file)
@@ -751,13 +751,13 @@ libxl_device_usbdev_list(libxl_ctx *ctx, uint32_t domid, int *num)
     usbctrls = libxl__xs_directory(gc, XBT_NULL, path, &nc);
 
     for (i = 0; i < nc; i++) {
-        int r, nd = 0;
+        int rc, nd = 0;
         libxl_device_usbdev *tmp = NULL;
 
-        r = libxl__device_usbdev_list_for_usbctrl(gc, domid,
+        rc = libxl__device_usbdev_list_for_usbctrl(gc, domid,
                                                   atoi(usbctrls[i]),
                                                   &tmp, &nd);
-        if (!r || !nd) continue;
+        if (rc || !nd) continue;
 
         usbdevs = libxl__realloc(NOGC, usbdevs,
                                  sizeof(*usbdevs) * (*num + nd));