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>
This commit is contained in:
Anthony Liguori 2011-12-07 21:34:16 -06:00
parent 212ad11168
commit 39bffca203
243 changed files with 3169 additions and 2543 deletions

View file

@ -221,10 +221,11 @@ static void spapr_main_pci_host_class_init(ObjectClass *klass, void *data)
k->init = spapr_main_pci_host_init;
}
static DeviceInfo spapr_main_pci_host_info = {
.name = "spapr-pci-host-bridge-pci",
.size = sizeof(PCIDevice),
.class_init = spapr_main_pci_host_class_init,
static TypeInfo spapr_main_pci_host_info = {
.name = "spapr-pci-host-bridge-pci",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = spapr_main_pci_host_class_init,
};
static void spapr_phb_class_init(ObjectClass *klass, void *data)
@ -234,16 +235,17 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data)
sdc->init = spapr_phb_init;
}
static DeviceInfo spapr_phb_info = {
.name = "spapr-pci-host-bridge",
.size = sizeof(sPAPRPHBState),
.class_init = spapr_phb_class_init,
static TypeInfo spapr_phb_info = {
.name = "spapr-pci-host-bridge",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(sPAPRPHBState),
.class_init = spapr_phb_class_init,
};
static void spapr_register_devices(void)
{
sysbus_qdev_register(&spapr_phb_info);
pci_qdev_register(&spapr_main_pci_host_info);
type_register_static(&spapr_phb_info);
type_register_static(&spapr_main_pci_host_info);
}
device_init(spapr_register_devices)