motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: register all types natively through QEMU Object Model

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

72
hw/unin_pci.c
View file

@ -350,9 +350,10 @@ static void unin_main_pci_host_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_HOST;
}
static DeviceInfo unin_main_pci_host_info = {
static TypeInfo unin_main_pci_host_info = {
.name = "uni-north-pci",
.size = sizeof(PCIDevice),
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = unin_main_pci_host_class_init,
};
@ -367,9 +368,10 @@ static void u3_agp_pci_host_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_HOST;
}
static DeviceInfo u3_agp_pci_host_info = {
static TypeInfo u3_agp_pci_host_info = {
.name = "u3-agp",
.size = sizeof(PCIDevice),
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = u3_agp_pci_host_class_init,
};
@ -384,9 +386,10 @@ static void unin_agp_pci_host_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_HOST;
}
static DeviceInfo unin_agp_pci_host_info = {
static TypeInfo unin_agp_pci_host_info = {
.name = "uni-north-agp",
.size = sizeof(PCIDevice),
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = unin_agp_pci_host_class_init,
};
@ -401,9 +404,10 @@ static void unin_internal_pci_host_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_HOST;
}
static DeviceInfo unin_internal_pci_host_info = {
static TypeInfo unin_internal_pci_host_info = {
.name = "uni-north-internal-pci",
.size = sizeof(PCIDevice),
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIDevice),
.class_init = unin_internal_pci_host_class_init,
};
@ -414,10 +418,11 @@ static void pci_unin_main_class_init(ObjectClass *klass, void *data)
sbc->init = pci_unin_main_init_device;
}
static DeviceInfo pci_unin_main_info = {
.name = "uni-north-pci-pcihost",
.size = sizeof(UNINState),
.class_init = pci_unin_main_class_init,
static TypeInfo pci_unin_main_info = {
.name = "uni-north-pci-pcihost",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UNINState),
.class_init = pci_unin_main_class_init,
};
static void pci_u3_agp_class_init(ObjectClass *klass, void *data)
@ -427,10 +432,11 @@ static void pci_u3_agp_class_init(ObjectClass *klass, void *data)
sbc->init = pci_u3_agp_init_device;
}
static DeviceInfo pci_u3_agp_info = {
.name = "u3-agp-pcihost",
.size = sizeof(UNINState),
.class_init = pci_u3_agp_class_init,
static TypeInfo pci_u3_agp_info = {
.name = "u3-agp-pcihost",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UNINState),
.class_init = pci_u3_agp_class_init,
};
static void pci_unin_agp_class_init(ObjectClass *klass, void *data)
@ -440,10 +446,11 @@ static void pci_unin_agp_class_init(ObjectClass *klass, void *data)
sbc->init = pci_unin_agp_init_device;
}
static DeviceInfo pci_unin_agp_info = {
.name = "uni-north-agp-pcihost",
.size = sizeof(UNINState),
.class_init = pci_unin_agp_class_init,
static TypeInfo pci_unin_agp_info = {
.name = "uni-north-agp-pcihost",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UNINState),
.class_init = pci_unin_agp_class_init,
};
static void pci_unin_internal_class_init(ObjectClass *klass, void *data)
@ -453,23 +460,24 @@ static void pci_unin_internal_class_init(ObjectClass *klass, void *data)
sbc->init = pci_unin_internal_init_device;
}
static DeviceInfo pci_unin_internal_info = {
.name = "uni-north-internal-pci-pcihost",
.size = sizeof(UNINState),
.class_init = pci_unin_internal_class_init,
static TypeInfo pci_unin_internal_info = {
.name = "uni-north-internal-pci-pcihost",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(UNINState),
.class_init = pci_unin_internal_class_init,
};
static void unin_register_devices(void)
{
pci_qdev_register(&unin_main_pci_host_info);
pci_qdev_register(&u3_agp_pci_host_info);
pci_qdev_register(&unin_agp_pci_host_info);
pci_qdev_register(&unin_internal_pci_host_info);
type_register_static(&unin_main_pci_host_info);
type_register_static(&u3_agp_pci_host_info);
type_register_static(&unin_agp_pci_host_info);
type_register_static(&unin_internal_pci_host_info);
sysbus_register_withprop(&pci_unin_main_info);
sysbus_register_withprop(&pci_u3_agp_info);
sysbus_register_withprop(&pci_unin_agp_info);
sysbus_register_withprop(&pci_unin_internal_info);
type_register_static(&pci_unin_main_info);
type_register_static(&pci_u3_agp_info);
type_register_static(&pci_unin_agp_info);
type_register_static(&pci_unin_internal_info);
}
device_init(unin_register_devices)