Commit 923fd989 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 36520faa 2b29f492
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -590,6 +590,13 @@ USBDevice *usbdevice_create(const char *cmdline)
        return NULL;
    }

    if (!bus) {
        error_report("Error: no usb bus to attach usbdevice %s, "
                     "please try -machine usb=on and check that "
                     "the machine model supports USB", driver);
        return NULL;
    }

    if (!f->usbdevice_init) {
        if (*params) {
            error_report("usbdevice %s accepts no params", driver);
+1 −0
Original line number Diff line number Diff line
@@ -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;
}
+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static int usb_ehci_sysbus_initfn(SysBusDevice *dev)

    s->capsbase = 0x100;
    s->opregbase = 0x140;
    s->dma = &dma_context_memory;

    usb_ehci_initfn(s, DEVICE(dev));
    sysbus_init_irq(dev, &s->irq);
+1 −0
Original line number Diff line number Diff line
@@ -1882,6 +1882,7 @@ static void ohci_pci_class_init(ObjectClass *klass, void *data)
    k->vendor_id = PCI_VENDOR_ID_APPLE;
    k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
    k->class_id = PCI_CLASS_SERIAL_USB;
    k->no_hotplug = 1;
    dc->desc = "Apple USB Controller";
    dc->props = ohci_pci_properties;
}
+1 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,7 @@ static void uhci_class_init(ObjectClass *klass, void *data)
    k->device_id = info->device_id;
    k->revision  = info->revision;
    k->class_id  = PCI_CLASS_SERIAL_USB;
    k->no_hotplug = 1;
    dc->vmsd = &vmstate_uhci;
    dc->props = uhci_properties;
    u->info = *info;
Loading