From patchwork Wed Dec 5 10:11:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/6] usb: Allow overriding of usb_desc at the device level Date: Wed, 05 Dec 2012 00:11:22 -0000 From: Gerd Hoffmann X-Patchwork-Id: 203833 Message-Id: <1354702284-13518-5-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Hans de Goede , Gerd Hoffmann From: Hans de Goede This allows devices to present a different set of descriptors based on device properties. Signed-off-by: Hans de Goede Signed-off-by: Gerd Hoffmann --- hw/usb.h | 1 + hw/usb/bus.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/usb.h b/hw/usb.h index 58f812f..268e653 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -230,6 +230,7 @@ struct USBDevice { USBEndpoint ep_out[USB_MAX_ENDPOINTS]; QLIST_HEAD(, USBDescString) strings; + const USBDesc *usb_desc; /* Overrides class usb_desc if not NULL */ const USBDescDevice *device; int configuration; diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 55d0edd..8264c24 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -166,6 +166,9 @@ const char *usb_device_get_product_desc(USBDevice *dev) const USBDesc *usb_device_get_usb_desc(USBDevice *dev) { USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev); + if (dev->usb_desc) { + return dev->usb_desc; + } return klass->usb_desc; }