| Message ID | 1450354795-31608-10-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Dec 17, 2015 at 01:19:51PM +0100, Markus Armbruster wrote: > These are "ICH9-LPC" and "ebus". > > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Signed-off-by: Markus Armbruster <armbru@pond.sub.org> > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/isa/lpc_ich9.c | 5 ++--- > hw/sparc64/sun4u.c | 6 ++---- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index 1ffc803..8e58449 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -602,7 +602,7 @@ static void ich9_lpc_initfn(Object *obj) > ich9_lpc_add_properties(lpc); > } > > -static int ich9_lpc_init(PCIDevice *d) > +static void ich9_lpc_realize(PCIDevice *d, Error **errp) > { > ICH9LPCState *lpc = ICH9_LPC_DEVICE(d); > ISABus *isa_bus; > @@ -628,7 +628,6 @@ static int ich9_lpc_init(PCIDevice *d) > memory_region_add_subregion_overlap(pci_address_space_io(d), > ICH9_RST_CNT_IOPORT, &lpc->rst_cnt_mem, > 1); > - return 0; > } > > static void ich9_device_plug_cb(HotplugHandler *hotplug_dev, > @@ -706,7 +705,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data) > > set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > dc->reset = ich9_lpc_reset; > - k->init = ich9_lpc_init; > + k->realize = ich9_lpc_realize; > dc->vmsd = &vmstate_ich9_lpc; > dc->props = ich9_lpc_properties; > k->config_write = ich9_lpc_config_write; > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index d6b929c..c37e8b0 100644 > --- a/hw/sparc64/sun4u.c > +++ b/hw/sparc64/sun4u.c > @@ -593,8 +593,7 @@ pci_ebus_init(PCIBus *bus, int devfn, qemu_irq *irqs) > return isa_bus; > } > > -static int > -pci_ebus_init1(PCIDevice *pci_dev) > +static void pci_ebus_realize(PCIDevice *pci_dev, Error **errp) > { > EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev); > > @@ -614,14 +613,13 @@ pci_ebus_init1(PCIDevice *pci_dev) > memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(), > 0, 0x4000); > pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1); > - return 0; > } > > static void ebus_class_init(ObjectClass *klass, void *data) > { > PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > > - k->init = pci_ebus_init1; > + k->realize = pci_ebus_realize; > k->vendor_id = PCI_VENDOR_ID_SUN; > k->device_id = PCI_DEVICE_ID_SUN_EBUS; > k->revision = 0x01; > -- > 2.4.3
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 1ffc803..8e58449 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -602,7 +602,7 @@ static void ich9_lpc_initfn(Object *obj) ich9_lpc_add_properties(lpc); } -static int ich9_lpc_init(PCIDevice *d) +static void ich9_lpc_realize(PCIDevice *d, Error **errp) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(d); ISABus *isa_bus; @@ -628,7 +628,6 @@ static int ich9_lpc_init(PCIDevice *d) memory_region_add_subregion_overlap(pci_address_space_io(d), ICH9_RST_CNT_IOPORT, &lpc->rst_cnt_mem, 1); - return 0; } static void ich9_device_plug_cb(HotplugHandler *hotplug_dev, @@ -706,7 +705,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->reset = ich9_lpc_reset; - k->init = ich9_lpc_init; + k->realize = ich9_lpc_realize; dc->vmsd = &vmstate_ich9_lpc; dc->props = ich9_lpc_properties; k->config_write = ich9_lpc_config_write; diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d6b929c..c37e8b0 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -593,8 +593,7 @@ pci_ebus_init(PCIBus *bus, int devfn, qemu_irq *irqs) return isa_bus; } -static int -pci_ebus_init1(PCIDevice *pci_dev) +static void pci_ebus_realize(PCIDevice *pci_dev, Error **errp) { EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev); @@ -614,14 +613,13 @@ pci_ebus_init1(PCIDevice *pci_dev) memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(), 0, 0x4000); pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1); - return 0; } static void ebus_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = pci_ebus_init1; + k->realize = pci_ebus_realize; k->vendor_id = PCI_VENDOR_ID_SUN; k->device_id = PCI_DEVICE_ID_SUN_EBUS; k->revision = 0x01;