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/versatile_pci.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/versatile_pci.c')
-rw-r--r-- | hw/versatile_pci.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index c2eb4dd..c4105e9 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -119,10 +119,11 @@ static void versatile_pci_host_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_PROCESSOR_CO; } -static DeviceInfo versatile_pci_host_info = { - .name = "versatile_pci_host", - .size = sizeof(PCIDevice), - .class_init = versatile_pci_host_class_init, +static TypeInfo versatile_pci_host_info = { + .name = "versatile_pci_host", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIDevice), + .class_init = versatile_pci_host_class_init, }; static void pci_vpb_class_init(ObjectClass *klass, void *data) @@ -132,10 +133,11 @@ static void pci_vpb_class_init(ObjectClass *klass, void *data) sdc->init = pci_vpb_init; } -static DeviceInfo pci_vpb_info = { - .name = "versatile_pci", - .size = sizeof(PCIVPBState), - .class_init = pci_vpb_class_init, +static TypeInfo pci_vpb_info = { + .name = "versatile_pci", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(PCIVPBState), + .class_init = pci_vpb_class_init, }; static void pci_realview_class_init(ObjectClass *klass, void *data) @@ -145,17 +147,18 @@ static void pci_realview_class_init(ObjectClass *klass, void *data) sdc->init = pci_realview_init; } -static DeviceInfo pci_realview_info = { - .name = "realview_pci", - .size = sizeof(PCIVPBState), - .class_init = pci_realview_class_init, +static TypeInfo pci_realview_info = { + .name = "realview_pci", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(PCIVPBState), + .class_init = pci_realview_class_init, }; static void versatile_pci_register_devices(void) { - sysbus_qdev_register(&pci_vpb_info); - sysbus_qdev_register(&pci_realview_info); - pci_qdev_register(&versatile_pci_host_info); + type_register_static(&pci_vpb_info); + type_register_static(&pci_realview_info); + type_register_static(&versatile_pci_host_info); } device_init(versatile_pci_register_devices) |