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/pl050.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'hw/pl050.c') diff --git a/hw/pl050.c b/hw/pl050.c index 5f60508..b0094ac 100644 --- a/hw/pl050.c +++ b/hw/pl050.c @@ -159,36 +159,40 @@ static int pl050_init_mouse(SysBusDevice *dev) static void pl050_kbd_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = pl050_init_keyboard; + dc->vmsd = &vmstate_pl050; } -static DeviceInfo pl050_kbd_info = { - .name = "pl050_keyboard", - .size = sizeof(pl050_state), - .vmsd = &vmstate_pl050, - .class_init = pl050_kbd_class_init, +static TypeInfo pl050_kbd_info = { + .name = "pl050_keyboard", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(pl050_state), + .class_init = pl050_kbd_class_init, }; static void pl050_mouse_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = pl050_init_mouse; + dc->vmsd = &vmstate_pl050; } -static DeviceInfo pl050_mouse_info = { - .name = "pl050_mouse", - .size = sizeof(pl050_state), - .vmsd = &vmstate_pl050, - .class_init = pl050_mouse_class_init, +static TypeInfo pl050_mouse_info = { + .name = "pl050_mouse", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(pl050_state), + .class_init = pl050_mouse_class_init, }; static void pl050_register_devices(void) { - sysbus_register_withprop(&pl050_kbd_info); - sysbus_register_withprop(&pl050_mouse_info); + type_register_static(&pl050_kbd_info); + type_register_static(&pl050_mouse_info); } device_init(pl050_register_devices) -- cgit v1.1