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/smc91c111.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'hw/smc91c111.c') diff --git a/hw/smc91c111.c b/hw/smc91c111.c index 4a68f6b8dc..4220880a0a 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -758,16 +758,25 @@ static int smc91c111_init1(SysBusDevice *dev) return 0; } -static SysBusDeviceInfo smc91c111_info = { - .init = smc91c111_init1, - .qdev.name = "smc91c111", - .qdev.size = sizeof(smc91c111_state), - .qdev.vmsd = &vmstate_smc91c111, - .qdev.reset = smc91c111_reset, - .qdev.props = (Property[]) { - DEFINE_NIC_PROPERTIES(smc91c111_state, conf), - DEFINE_PROP_END_OF_LIST(), - } +static Property smc91c111_properties[] = { + DEFINE_NIC_PROPERTIES(smc91c111_state, conf), + DEFINE_PROP_END_OF_LIST(), +}; + +static void smc91c111_class_init(ObjectClass *klass, void *data) +{ + SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + + k->init = smc91c111_init1; +} + +static DeviceInfo smc91c111_info = { + .name = "smc91c111", + .size = sizeof(smc91c111_state), + .vmsd = &vmstate_smc91c111, + .reset = smc91c111_reset, + .props = smc91c111_properties, + .class_init = smc91c111_class_init, }; static void smc91c111_register_devices(void) -- cgit v1.2.3