diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-07 21:34:16 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-03 10:41:06 -0600 |
commit | 39bffca2030950ef6efe57c2fac8327a45ae1015 (patch) | |
tree | 325262f44978e6116c9e43f688c900e08ee83738 /hw/kvm/apic.c | |
parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
download | qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.bz2 |
qdev: register all types natively through QEMU Object Model
This was done in a mostly automated fashion. I did it in three steps and then
rebased it into a single step which avoids repeatedly touching every file in
the tree.
The first step was a sed-based addition of the parent type to the subclass
registration functions.
The second step was another sed-based removal of subclass registration functions
while also adding virtual functions from the base class into a class_init
function as appropriate.
Finally, a python script was used to convert the DeviceInfo structures and
qdev_register_subclass functions to TypeInfo structures, class_init functions,
and type_register_static calls.
We are almost fully converted to QOM after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/kvm/apic.c')
-rw-r--r-- | hw/kvm/apic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index bc80ae4..89e33b0 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c @@ -132,14 +132,15 @@ static void kvm_apic_class_init(ObjectClass *klass, void *data) k->external_nmi = kvm_apic_external_nmi; } -static DeviceInfo kvm_apic_info = { +static TypeInfo kvm_apic_info = { .name = "kvm-apic", + .parent = TYPE_APIC_COMMON, .class_init = kvm_apic_class_init, }; static void kvm_apic_register_device(void) { - apic_qdev_register(&kvm_apic_info); + type_register_static(&kvm_apic_info); } device_init(kvm_apic_register_device) |