diff options
author | Anthony Liguori | 2011-12-08 04:34:16 +0100 |
---|---|---|
committer | Anthony Liguori | 2012-02-03 17:41:06 +0100 |
commit | 39bffca2030950ef6efe57c2fac8327a45ae1015 (patch) | |
tree | 325262f44978e6116c9e43f688c900e08ee83738 /hw/ioapic_common.c | |
parent | qdev: kill off DeviceInfo list (diff) | |
download | qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.xz qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip |
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/ioapic_common.c')
-rw-r--r-- | hw/ioapic_common.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c index 4bb7ea9b1f..f932700d12 100644 --- a/hw/ioapic_common.c +++ b/hw/ioapic_common.c @@ -96,8 +96,11 @@ static const VMStateDescription vmstate_ioapic_common = { static void ioapic_common_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *sc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); sc->init = ioapic_init_common; + dc->vmsd = &vmstate_ioapic_common; + dc->no_user = 1; } static TypeInfo ioapic_common_type = { @@ -109,13 +112,6 @@ static TypeInfo ioapic_common_type = { .abstract = true, }; -void ioapic_qdev_register(DeviceInfo *info) -{ - info->vmsd = &vmstate_ioapic_common; - info->no_user = 1; - sysbus_qdev_register_subclass(info, TYPE_IOAPIC_COMMON); -} - static void register_devices(void) { type_register_static(&ioapic_common_type); |