提交 3a80cead 编写于 作者: M Markus Armbruster

isa: Trivially convert remaining PCI-ISA bridges to realize()

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: NMarkus Armbruster <armbru@pond.sub.org>
Reviewed-by: NMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Message-Id: <1450370121-5768-10-git-send-email-armbru@redhat.com>
上级 c72fbf98
...@@ -602,7 +602,7 @@ static void ich9_lpc_initfn(Object *obj) ...@@ -602,7 +602,7 @@ static void ich9_lpc_initfn(Object *obj)
ich9_lpc_add_properties(lpc); 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); ICH9LPCState *lpc = ICH9_LPC_DEVICE(d);
ISABus *isa_bus; ISABus *isa_bus;
...@@ -628,7 +628,6 @@ static int ich9_lpc_init(PCIDevice *d) ...@@ -628,7 +628,6 @@ static int ich9_lpc_init(PCIDevice *d)
memory_region_add_subregion_overlap(pci_address_space_io(d), memory_region_add_subregion_overlap(pci_address_space_io(d),
ICH9_RST_CNT_IOPORT, &lpc->rst_cnt_mem, ICH9_RST_CNT_IOPORT, &lpc->rst_cnt_mem,
1); 1);
return 0;
} }
static void ich9_device_plug_cb(HotplugHandler *hotplug_dev, static void ich9_device_plug_cb(HotplugHandler *hotplug_dev,
...@@ -706,7 +705,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data) ...@@ -706,7 +705,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->reset = ich9_lpc_reset; dc->reset = ich9_lpc_reset;
k->init = ich9_lpc_init; k->realize = ich9_lpc_realize;
dc->vmsd = &vmstate_ich9_lpc; dc->vmsd = &vmstate_ich9_lpc;
dc->props = ich9_lpc_properties; dc->props = ich9_lpc_properties;
k->config_write = ich9_lpc_config_write; k->config_write = ich9_lpc_config_write;
......
...@@ -600,8 +600,7 @@ pci_ebus_init(PCIBus *bus, int devfn, qemu_irq *irqs) ...@@ -600,8 +600,7 @@ pci_ebus_init(PCIBus *bus, int devfn, qemu_irq *irqs)
return isa_bus; return isa_bus;
} }
static int static void pci_ebus_realize(PCIDevice *pci_dev, Error **errp)
pci_ebus_init1(PCIDevice *pci_dev)
{ {
EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev); EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
...@@ -621,14 +620,13 @@ pci_ebus_init1(PCIDevice *pci_dev) ...@@ -621,14 +620,13 @@ pci_ebus_init1(PCIDevice *pci_dev)
memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(), memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(),
0, 0x4000); 0, 0x4000);
pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1); pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1);
return 0;
} }
static void ebus_class_init(ObjectClass *klass, void *data) static void ebus_class_init(ObjectClass *klass, void *data)
{ {
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = pci_ebus_init1; k->realize = pci_ebus_realize;
k->vendor_id = PCI_VENDOR_ID_SUN; k->vendor_id = PCI_VENDOR_ID_SUN;
k->device_id = PCI_DEVICE_ID_SUN_EBUS; k->device_id = PCI_DEVICE_ID_SUN_EBUS;
k->revision = 0x01; k->revision = 0x01;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册