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/prep_pci.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'hw/prep_pci.c') diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 4ff104904a..b3b85b7ca2 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -154,12 +154,19 @@ static DeviceInfo raven_info = { .class_init = raven_class_init, }; -static SysBusDeviceInfo raven_pcihost_info = { - .qdev.name = "raven-pcihost", - .qdev.fw_name = "pci", - .qdev.size = sizeof(PREPPCIState), - .qdev.no_user = 1, - .init = raven_pcihost_init, +static void raven_pcihost_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = raven_pcihost_init; +} + +static DeviceInfo raven_pcihost_info = { + .name = "raven-pcihost", + .fw_name = "pci", + .size = sizeof(PREPPCIState), + .class_init = raven_pcihost_class_init, + .no_user = 1, }; static void raven_register_devices(void) -- cgit v1.2.3-55-g7522