[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/41] isa: Trivially convert remaining PCI-ISA bridg
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 12/41] isa: Trivially convert remaining PCI-ISA bridges to realize() |
Date: |
Wed, 13 Jan 2016 16:43:10 +0100 |
These are "ICH9-LPC" and "ebus".
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Mark Cave-Ayland <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-Id: <address@hidden>
---
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 7a433d3..8058aac 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -600,8 +600,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);
@@ -621,14 +620,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
- [Qemu-devel] [PULL 05/41] omap: Don't use hw_error() in device init() methods, (continued)
- [Qemu-devel] [PULL 05/41] omap: Don't use hw_error() in device init() methods, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 07/41] etraxfs_eth: Don't use hw_error() in init() method, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 11/41] sysbus: Don't use hw_error() in machine_init_done_notifiers, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 17/41] qemu-nbd: Replace BSDism <err.h> by error_report(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 28/41] error: Use error_prepend() where it makes obvious sense, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 19/41] error: Use error_report_err() instead of monitor_printf(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 35/41] pci-assign: Clean up "Failed to assign" error messages, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 06/41] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 14/41] isa: Clean up inappropriate hw_error(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 23/41] qemu-nbd: Clean up "Failed to load snapshot" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 12/41] isa: Trivially convert remaining PCI-ISA bridges to realize(),
Markus Armbruster <=
- [Qemu-devel] [PULL 16/41] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 25/41] error: New error_prepend(), error_reportf_err(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 10/41] hw/arm/virt: Fix property "gic-version" error handling, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 29/41] spapr: Use error_reportf_err(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 41/41] checkpatch: Detect newlines in error_report and other error functions, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 33/41] vmdk: Clean up control flow in vmdk_parse_extents() a bit, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 32/41] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 40/41] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 22/41] block: Clean up "Could not create temporary overlay" error message, Markus Armbruster, 2016/01/13