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/ioapic.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'hw/ioapic.c') diff --git a/hw/ioapic.c b/hw/ioapic.c index 0c8be5006a..0939009637 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -235,11 +235,18 @@ static void ioapic_init(IOAPICCommonState *s, int instance_no) ioapics[instance_no] = s; } -static IOAPICCommonInfo ioapic_info = { - .busdev.qdev.name = "ioapic", - .busdev.qdev.size = sizeof(IOAPICCommonState), - .busdev.qdev.reset = ioapic_reset_common, - .init = ioapic_init, +static void ioapic_class_init(ObjectClass *klass, void *data) +{ + IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); + + k->init = ioapic_init; +} + +static DeviceInfo ioapic_info = { + .name = "ioapic", + .size = sizeof(IOAPICCommonState), + .reset = ioapic_reset_common, + .class_init = ioapic_class_init, }; static void ioapic_register_devices(void) -- cgit v1.2.3-55-g7522