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/gt64xxx.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'hw/gt64xxx.c') diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 79d2dfb..e8cd59c 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -1147,10 +1147,11 @@ static void gt64120_pci_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_BRIDGE_HOST; } -static DeviceInfo gt64120_pci_info = { - .name = "gt64120_pci", - .size = sizeof(PCIDevice), - .class_init = gt64120_pci_class_init, +static TypeInfo gt64120_pci_info = { + .name = "gt64120_pci", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIDevice), + .class_init = gt64120_pci_class_init, }; static void gt64120_class_init(ObjectClass *klass, void *data) @@ -1160,16 +1161,17 @@ static void gt64120_class_init(ObjectClass *klass, void *data) sdc->init = gt64120_init; } -static DeviceInfo gt64120_info = { - .name = "gt64120", - .size = sizeof(GT64120State), - .class_init = gt64120_class_init, +static TypeInfo gt64120_info = { + .name = "gt64120", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(GT64120State), + .class_init = gt64120_class_init, }; static void gt64120_pci_register_devices(void) { - sysbus_qdev_register(>64120_info); - pci_qdev_register(>64120_pci_info); + type_register_static(>64120_info); + type_register_static(>64120_pci_info); } device_init(gt64120_pci_register_devices) -- cgit v1.1