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/ppce500_pci.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'hw/ppce500_pci.c') diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index bc783bf..f8c4f11 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -355,11 +355,18 @@ static DeviceInfo e500_host_bridge_info = { .class_init = e500_host_bridge_class_init, }; -static SysBusDeviceInfo e500_pcihost_info = { - .init = e500_pcihost_initfn, - .qdev.name = "e500-pcihost", - .qdev.size = sizeof(PPCE500PCIState), - .qdev.vmsd = &vmstate_ppce500_pci, +static void e500_pcihost_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = e500_pcihost_initfn; +} + +static DeviceInfo e500_pcihost_info = { + .name = "e500-pcihost", + .size = sizeof(PPCE500PCIState), + .vmsd = &vmstate_ppce500_pci, + .class_init = e500_pcihost_class_init, }; static void e500_pci_register(void) -- cgit v1.1