From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunyan Liu Subject: [PATCH V4 4/7] libxl: add libxl_device_usb_assignable_list API Date: Wed, 10 Jun 2015 11:20:38 +0800 Message-ID: <1433906441-3280-5-git-send-email-cyliu@suse.com> References: <1433906441-3280-1-git-send-email-cyliu@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1433906441-3280-1-git-send-email-cyliu@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: george.dunlap@eu.citrix.com, wei.liu2@citrix.com, Ian.Jackson@eu.citrix.com, ian.campbell@citrix.com, Chunyan Liu List-Id: xen-devel@lists.xenproject.org Add API for listing assignable USB devices info. Assignable USB device means the USB device type is assignable and it's not assigned to any guest yet. Signed-off-by: Chunyan Liu --- This could be squashed with previous patch. Split because there is some dispute on this. If this is acceptable, could be squashed, otherwise could be removed. tools/libxl/libxl.h | 3 +++ tools/libxl/libxl_pvusb.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index d192300..b65a096 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1314,6 +1314,9 @@ int libxl_device_usbctrl_getinfo(libxl_ctx *ctx, uint32_t domid, LIBXL_EXTERNAL_CALLERS_ONLY; /* USB Devices */ +libxl_device_usb * +libxl_device_usb_assignable_list(libxl_ctx *ctx, int *num); + int libxl_device_usb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_usb *usb, const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; diff --git a/tools/libxl/libxl_pvusb.c b/tools/libxl/libxl_pvusb.c index a6e1aa1..739a16d 100644 --- a/tools/libxl/libxl_pvusb.c +++ b/tools/libxl/libxl_pvusb.c @@ -555,6 +555,52 @@ static bool is_usb_assignable(libxl__gc *gc, libxl_device_usb *usb) return classcode != USBHUB_CLASS_CODE; } +libxl_device_usb * +libxl_device_usb_assignable_list(libxl_ctx *ctx, int *num) +{ + GC_INIT(ctx); + libxl_device_usb *usbs = NULL; + libxl_device_usb *assigned; + int num_assigned; + struct dirent *de; + DIR *dir; + + *num = 0; + + if (libxl__device_usb_assigned_list(gc, &assigned, &num_assigned) < 0) + goto out; + + if (!(dir = opendir(SYSFS_USB_DEV))) + goto out; + + while ((de = readdir(dir))) { + libxl_device_usb usb; + + if (!de->d_name) + continue; + + usb.busid = de->d_name; + if (!is_usb_assignable(gc, &usb)) + continue; + + if (is_usb_in_array(assigned, num_assigned, &usb)) + continue; + + usbs = libxl__realloc(NOGC, usbs, sizeof(*usbs) * (*num + 1)); + libxl_device_usb_init(usbs + *num); + usbs[*num].busid = libxl__strdup(NOGC, de->d_name); + usb_busaddr_from_busid(gc, usbs[*num].busid, + &(usbs[*num].hostbus), &(usbs[*num].hostaddr)); + (*num)++; + } + + closedir(dir); + +out: + GC_FREE; + return usbs; +} + /* get usb devices under certain usb controller */ static int libxl__device_usb_list_per_usbctrl(libxl__gc *gc, uint32_t domid, int usbctrl, -- 2.1.4