From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42524 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEFg-00013R-D4 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGEFe-0005B6-DA for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGEFe-0005AK-4l for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:26 -0500 From: Gleb Natapov Date: Wed, 10 Nov 2010 19:14:17 +0200 Message-Id: <1289409261-5418-11-git-send-email-gleb@redhat.com> In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com> References: <1289409261-5418-1-git-send-email-gleb@redhat.com> Subject: [Qemu-devel] [PATCHv3 10/14] Add get_dev_path callback for usb bus. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org, mst@redhat.com Signed-off-by: Gleb Natapov --- hw/usb-bus.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 256b881..6292282 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -5,11 +5,13 @@ #include "monitor.h" static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent); +static char *usbbus_get_fw_dev_path(DeviceState *dev); static struct BusInfo usb_bus_info = { .name = "USB", .size = sizeof(USBBus), .print_dev = usb_bus_dev_print, + .get_fw_dev_path = usbbus_get_fw_dev_path, }; static int next_usb_bus = 0; static QTAILQ_HEAD(, USBBus) busses = QTAILQ_HEAD_INITIALIZER(busses); @@ -307,3 +309,36 @@ USBDevice *usbdevice_create(const char *cmdline) } return usb->usbdevice_init(params); } + +static int usbbus_get_fw_dev_path_helper(USBDevice *d, USBBus *bus, char *p, + int len) +{ + int l = 0; + USBPort *port; + + QTAILQ_FOREACH(port, &bus->used, next) { + if (port->dev != d) + continue; + + if (port->pdev) { + l = usbbus_get_fw_dev_path_helper(port->pdev, bus, p, len); + } + l += snprintf(p + l, len - l, "%s@%x/", qdev_fw_name(&d->qdev), + port->index); + return l; + } + return 0; +} + +static char *usbbus_get_fw_dev_path(DeviceState *dev) +{ + USBDevice *d = (USBDevice*)dev; + USBBus *bus = usb_bus_from_device(d); + char path[100]; + int l; + + l = usbbus_get_fw_dev_path_helper(d, bus, path, sizeof(path)); + path[l-1] = '\0'; + + return strdup(path); +} -- 1.7.1