From 999e12bbe85c5dcf49bef13bce4f97399c7105f4 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Tue, 24 Jan 2012 13:12:29 -0600 Subject: sysbus: apic: ioapic: convert to QEMU Object Model This converts three devices because apic and ioapic are subclasses of sysbus. Converting subclasses independently of their base class is prohibitively hard. Signed-off-by: Anthony Liguori --- hw/spapr_vio.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'hw/spapr_vio.c') diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index bc586bf..dc2e9c9 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -755,11 +755,18 @@ static int spapr_vio_bridge_init(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo spapr_vio_bridge_info = { - .init = spapr_vio_bridge_init, - .qdev.name = "spapr-vio-bridge", - .qdev.size = sizeof(SysBusDevice), - .qdev.no_user = 1, +static void spapr_vio_bridge_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass); + + sbc->init = spapr_vio_bridge_init; +} + +static DeviceInfo spapr_vio_bridge_info = { + .name = "spapr-vio-bridge", + .size = sizeof(SysBusDevice), + .no_user = 1, + .class_init = spapr_vio_bridge_class_init, }; static TypeInfo spapr_vio_type_info = { -- cgit v1.1