mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -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
18
hw/piix4.c
18
hw/piix4.c
|
@ -104,6 +104,7 @@ int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
|
|||
|
||||
static void piix4_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
||||
|
||||
k->no_hotplug = 1;
|
||||
|
@ -111,19 +112,20 @@ static void piix4_class_init(ObjectClass *klass, void *data)
|
|||
k->vendor_id = PCI_VENDOR_ID_INTEL;
|
||||
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0;
|
||||
k->class_id = PCI_CLASS_BRIDGE_ISA;
|
||||
dc->desc = "ISA bridge";
|
||||
dc->no_user = 1;
|
||||
dc->vmsd = &vmstate_piix4;
|
||||
}
|
||||
|
||||
static DeviceInfo piix4_info = {
|
||||
.name = "PIIX4",
|
||||
.desc = "ISA bridge",
|
||||
.size = sizeof(PIIX4State),
|
||||
.vmsd = &vmstate_piix4,
|
||||
.no_user = 1,
|
||||
.class_init = piix4_class_init,
|
||||
static TypeInfo piix4_info = {
|
||||
.name = "PIIX4",
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(PIIX4State),
|
||||
.class_init = piix4_class_init,
|
||||
};
|
||||
|
||||
static void piix4_register(void)
|
||||
{
|
||||
pci_qdev_register(&piix4_info);
|
||||
type_register_static(&piix4_info);
|
||||
}
|
||||
device_init(piix4_register);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue