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/cs4231.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'hw/cs4231.c') diff --git a/hw/cs4231.c b/hw/cs4231.c index 2dfb708fe7..87c4eb9490 100644 --- a/hw/cs4231.c +++ b/hw/cs4231.c @@ -151,15 +151,24 @@ static int cs4231_init1(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo cs4231_info = { - .init = cs4231_init1, - .qdev.name = "SUNW,CS4231", - .qdev.size = sizeof(CSState), - .qdev.vmsd = &vmstate_cs4231, - .qdev.reset = cs_reset, - .qdev.props = (Property[]) { - {.name = NULL} - } +static Property cs4231_properties[] = { + {.name = NULL}, +}; + +static void cs4231_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = cs4231_init1; +} + +static DeviceInfo cs4231_info = { + .name = "SUNW,CS4231", + .size = sizeof(CSState), + .vmsd = &vmstate_cs4231, + .reset = cs_reset, + .props = cs4231_properties, + .class_init = cs4231_class_init, }; static void cs4231_register_devices(void) -- cgit 1.4.1