diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:20:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:20:21 -0600 |
| commit | 923fd9897b0ffbcc5091181f8b0484aa2e36413b (patch) | |
| tree | d36784488baf360fff31490f15c6eae7ec5d548e /hw/usb/hcd-ehci-pci.c | |
| parent | 36520faa33abb91b3c8a80e935b82afec78f9bee (diff) | |
| parent | 2b29f492c844ed03d6d16ebe6bb760d71b6557fe (diff) | |
Merge remote-tracking branch 'kraxel/usb.73' into staging
* kraxel/usb.73:
ehci-sysbus: Attach DMA context.
usb: fail usbdevice_create() when there is no USB bus
usb: tag usb host adapters as not hotpluggable.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb/hcd-ehci-pci.c')
| -rw-r--r-- | hw/usb/hcd-ehci-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 5887eab197..41dbb539f2 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -123,6 +123,7 @@ static void ehci_class_init(ObjectClass *klass, void *data) k->revision = i->revision; k->class_id = PCI_CLASS_SERIAL_USB; k->config_write = usb_ehci_pci_write_config; + k->no_hotplug = 1; dc->vmsd = &vmstate_ehci_pci; dc->props = ehci_pci_properties; } |