mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
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:
parent
212ad11168
commit
39bffca203
243 changed files with 3169 additions and 2543 deletions
|
@ -124,39 +124,43 @@ static int grackle_pci_host_init(PCIDevice *d)
|
|||
static void grackle_pci_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
||||
k->init = grackle_pci_host_init;
|
||||
k->vendor_id = PCI_VENDOR_ID_MOTOROLA;
|
||||
k->device_id = PCI_DEVICE_ID_MOTOROLA_MPC106;
|
||||
k->revision = 0x00;
|
||||
k->class_id = PCI_CLASS_BRIDGE_HOST;
|
||||
dc->no_user = 1;
|
||||
}
|
||||
|
||||
static DeviceInfo grackle_pci_info = {
|
||||
.name = "grackle",
|
||||
.size = sizeof(PCIDevice),
|
||||
.no_user = 1,
|
||||
static TypeInfo grackle_pci_info = {
|
||||
.name = "grackle",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PCIDevice),
|
||||
.class_init = grackle_pci_class_init,
|
||||
};
|
||||
|
||||
static void pci_grackle_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
||||
k->init = pci_grackle_init_device;
|
||||
dc->no_user = 1;
|
||||
}
|
||||
|
||||
static DeviceInfo grackle_pci_host_info = {
|
||||
.name = "grackle-pcihost",
|
||||
.size = sizeof(GrackleState),
|
||||
.no_user = 1,
|
||||
.class_init = pci_grackle_class_init,
|
||||
static TypeInfo grackle_pci_host_info = {
|
||||
.name = "grackle-pcihost",
|
||||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(GrackleState),
|
||||
.class_init = pci_grackle_class_init,
|
||||
};
|
||||
|
||||
static void grackle_register_devices(void)
|
||||
{
|
||||
sysbus_qdev_register(&grackle_pci_host_info);
|
||||
pci_qdev_register(&grackle_pci_info);
|
||||
type_register_static(&grackle_pci_info);
|
||||
type_register_static(&grackle_pci_host_info);
|
||||
}
|
||||
|
||||
device_init(grackle_register_devices)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue