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/kvm/apic.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'hw/kvm/apic.c') diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index 6300695e86..bc80ae4ede 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c @@ -122,12 +122,19 @@ static void kvm_apic_init(APICCommonState *s) MSI_SPACE_SIZE); } -static APICCommonInfo kvm_apic_info = { - .busdev.qdev.name = "kvm-apic", - .init = kvm_apic_init, - .set_base = kvm_apic_set_base, - .set_tpr = kvm_apic_set_tpr, - .external_nmi = kvm_apic_external_nmi, +static void kvm_apic_class_init(ObjectClass *klass, void *data) +{ + APICCommonClass *k = APIC_COMMON_CLASS(klass); + + k->init = kvm_apic_init; + k->set_base = kvm_apic_set_base; + k->set_tpr = kvm_apic_set_tpr; + k->external_nmi = kvm_apic_external_nmi; +} + +static DeviceInfo kvm_apic_info = { + .name = "kvm-apic", + .class_init = kvm_apic_class_init, }; static void kvm_apic_register_device(void) -- cgit v1.2.3-55-g7522