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 /hw/i386 | |
| parent | 21ca4a5bb3cde109e68059ee357b3114afbc51e4 (diff) | |
| parent | 93c8e4dc386a243d7d417567d81dc1f1698478a4 (diff) | |
| download | qemu-89f204d2c60fbf3e0c5af1ff1681e57c9f057178.tar.gz qemu-89f204d2c60fbf3e0c5af1ff1681e57c9f057178.tar.bz2 qemu-89f204d2c60fbf3e0c5af1ff1681e57c9f057178.zip | |
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 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 97362f2c26..7972443374 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -622,6 +622,18 @@ static QEMUMachine pc_machine_v0_13 = { .driver = "virtio-serial-pci",\ .property = "vectors",\ .value = stringify(0),\ + },{\ + .driver = "usb-mouse",\ + .property = "serial",\ + .value = "1",\ + },{\ + .driver = "usb-tablet",\ + .property = "serial",\ + .value = "1",\ + },{\ + .driver = "usb-kbd",\ + .property = "serial",\ + .value = "1",\ } static QEMUMachine pc_machine_v0_12 = { |