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/apic.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'hw/apic.c') diff --git a/hw/apic.c b/hw/apic.c index e59c964083..353119d7b0 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -763,13 +763,20 @@ static void apic_init(APICCommonState *s) local_apics[s->idx] = s; } -static APICCommonInfo apic_info = { - .busdev.qdev.name = "apic", - .init = apic_init, - .set_base = apic_set_base, - .set_tpr = apic_set_tpr, - .external_nmi = apic_external_nmi, - .post_load = apic_post_load, +static void apic_class_init(ObjectClass *klass, void *data) +{ + APICCommonClass *k = APIC_COMMON_CLASS(klass); + + k->init = apic_init; + k->set_base = apic_set_base; + k->set_tpr = apic_set_tpr; + k->external_nmi = apic_external_nmi; + k->post_load = apic_post_load; +} + +static DeviceInfo apic_info = { + .name = "apic", + .class_init = apic_class_init, }; static void apic_register_devices(void) -- cgit v1.2.3