diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-24 14:33:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-24 14:33:00 -0500 |
| commit | 89f204d2c60fbf3e0c5af1ff1681e57c9f057178 (patch) | |
| tree | e459490511249032a62d792357bfe7c09c4eef02 /include | |
| parent | 21ca4a5bb3cde109e68059ee357b3114afbc51e4 (diff) | |
| parent | 93c8e4dc386a243d7d417567d81dc1f1698478a4 (diff) | |
Merge remote-tracking branch 'kraxel/usb.84' into staging
# By Andreas Färber (3) and others
# Via Gerd Hoffmann
* kraxel/usb.84:
usb: fix serial number for hid devices
usb: add serial bus property
usb-host-libusb: set USB_DEV_FLAG_IS_HOST
usb/host-libusb: Fix building with libusb git master code
usb/hcd-ehci: Add Faraday FUSBH200 support
usb/hcd-ehci: Replace PORTSC macros with variables
usb/hcd-ehci: Add Tegra2 SysBus EHCI device
usb/hcd-ehci: Split off instance_init from realize
usb/hcd-ehci-sysbus: Convert to QOM realize
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index 4d9d05e9bc..901b0da8b0 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -205,6 +205,7 @@ struct USBDevice { DeviceState qdev; USBPort *port; char *port_path; + char *serial; void *opaque; uint32_t flags; |