From 39bffca2030950ef6efe57c2fac8327a45ae1015 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 7 Dec 2011 21:34:16 -0600 Subject: 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 --- hw/armv7m.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'hw/armv7m.c') diff --git a/hw/armv7m.c b/hw/armv7m.c index 884fc90..de3d7e0 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -252,21 +252,23 @@ static Property bitband_properties[] = { static void bitband_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = bitband_init; + dc->props = bitband_properties; } -static DeviceInfo bitband_info = { - .name = "ARM,bitband-memory", - .size = sizeof(BitBandState), - .props = bitband_properties, - .class_init = bitband_class_init, +static TypeInfo bitband_info = { + .name = "ARM,bitband-memory", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(BitBandState), + .class_init = bitband_class_init, }; static void armv7m_register_devices(void) { - sysbus_register_withprop(&bitband_info); + type_register_static(&bitband_info); } device_init(armv7m_register_devices) -- cgit v1.1