| Message ID | 5eb14dae7f16c5ff92b414605acb134bbc5269bc.1372673778.git.hutao@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
Am 01.07.2013 12:18, schrieb Hu Tao: > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > --- > hw/usb/hcd-ohci.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c > index 912255d..ee824ee 100644 > --- a/hw/usb/hcd-ohci.c > +++ b/hw/usb/hcd-ohci.c > @@ -1880,17 +1880,16 @@ typedef struct { > dma_addr_t dma_offset; > } OHCISysBusState; > > -static int ohci_init_pxa(SysBusDevice *dev) > +static void ohci_realize_pxa(DeviceState *dev, Error **errp) > { > OHCISysBusState *s = SYSBUS_OHCI(dev); > + SysBusDevice *b = SYS_BUS_DEVICE(dev); I stumbled over b not being very descriptive for SysBusDevice (I would've expected d for ...Device). Seeing that PCIDevice *pd was used elsewhere, I will adopt sbd here, as suggested by Peter C. https://github.com/afaerber/qemu-cpu/commits/qom-next Regards, Andreas > > /* Cannot fail as we pass NULL for masterbus */ > - usb_ohci_init(&s->ohci, DEVICE(dev), s->num_ports, s->dma_offset, NULL, 0, > + usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, NULL, 0, > &address_space_memory); > - sysbus_init_irq(dev, &s->ohci.irq); > - sysbus_init_mmio(dev, &s->ohci.mem); > - > - return 0; > + sysbus_init_irq(b, &s->ohci.irq); > + sysbus_init_mmio(b, &s->ohci.mem); > } > > static Property ohci_pci_properties[] = { > @@ -1930,9 +1929,8 @@ static Property ohci_sysbus_properties[] = { > static void ohci_sysbus_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass); > > - sbc->init = ohci_init_pxa; > + dc->realize = ohci_realize_pxa; > dc->desc = "OHCI USB Controller"; > dc->props = ohci_sysbus_properties; > } >
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 912255d..ee824ee 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1880,17 +1880,16 @@ typedef struct { dma_addr_t dma_offset; } OHCISysBusState; -static int ohci_init_pxa(SysBusDevice *dev) +static void ohci_realize_pxa(DeviceState *dev, Error **errp) { OHCISysBusState *s = SYSBUS_OHCI(dev); + SysBusDevice *b = SYS_BUS_DEVICE(dev); /* Cannot fail as we pass NULL for masterbus */ - usb_ohci_init(&s->ohci, DEVICE(dev), s->num_ports, s->dma_offset, NULL, 0, + usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, NULL, 0, &address_space_memory); - sysbus_init_irq(dev, &s->ohci.irq); - sysbus_init_mmio(dev, &s->ohci.mem); - - return 0; + sysbus_init_irq(b, &s->ohci.irq); + sysbus_init_mmio(b, &s->ohci.mem); } static Property ohci_pci_properties[] = { @@ -1930,9 +1929,8 @@ static Property ohci_sysbus_properties[] = { static void ohci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass); - sbc->init = ohci_init_pxa; + dc->realize = ohci_realize_pxa; dc->desc = "OHCI USB Controller"; dc->props = ohci_sysbus_properties; }
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> --- hw/usb/hcd-ohci.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)