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/arm_mptimer.c | |
parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
download | hqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip hqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz |
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/arm_mptimer.c')
-rw-r--r-- | hw/arm_mptimer.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/hw/arm_mptimer.c b/hw/arm_mptimer.c index 06319c2..5a02365 100644 --- a/hw/arm_mptimer.c +++ b/hw/arm_mptimer.c @@ -311,29 +311,33 @@ static const VMStateDescription vmstate_arm_mptimer = { } }; +static Property arm_mptimer_properties[] = { + DEFINE_PROP_UINT32("num-cpu", arm_mptimer_state, num_cpu, 0), + DEFINE_PROP_END_OF_LIST() +}; + static void arm_mptimer_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass); sbc->init = arm_mptimer_init; + dc->vmsd = &vmstate_arm_mptimer; + dc->reset = arm_mptimer_reset; + dc->no_user = 1; + dc->props = arm_mptimer_properties; } -static DeviceInfo arm_mptimer_info = { - .name = "arm_mptimer", - .size = sizeof(arm_mptimer_state), - .vmsd = &vmstate_arm_mptimer, - .reset = arm_mptimer_reset, - .no_user = 1, - .class_init = arm_mptimer_class_init, - .props = (Property[]) { - DEFINE_PROP_UINT32("num-cpu", arm_mptimer_state, num_cpu, 0), - DEFINE_PROP_END_OF_LIST() - } +static TypeInfo arm_mptimer_info = { + .name = "arm_mptimer", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(arm_mptimer_state), + .class_init = arm_mptimer_class_init, }; static void arm_mptimer_register_devices(void) { - sysbus_register_withprop(&arm_mptimer_info); + type_register_static(&arm_mptimer_info); } device_init(arm_mptimer_register_devices) |