motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13: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

70
hw/piix_pci.c
View file

@ -504,8 +504,12 @@ static int piix3_initfn(PCIDevice *dev)
static void piix3_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix3;
dc->no_user = 1,
k->no_hotplug = 1;
k->init = piix3_initfn;
k->config_write = piix3_write_config;
@ -514,19 +518,21 @@ static void piix3_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_ISA;
}
static DeviceInfo piix3_info = {
.name = "PIIX3",
.desc = "ISA bridge",
.size = sizeof(PIIX3State),
.vmsd = &vmstate_piix3,
.no_user = 1,
.class_init = piix3_class_init,
static TypeInfo piix3_info = {
.name = "PIIX3",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIX3State),
.class_init = piix3_class_init,
};
static void piix3_xen_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix3;
dc->no_user = 1;
k->no_hotplug = 1;
k->init = piix3_initfn;
k->config_write = piix3_write_config_xen;
@ -535,17 +541,16 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_BRIDGE_ISA;
};
static DeviceInfo piix3_xen_info = {
.name = "PIIX3-xen",
.desc = "ISA bridge",
.size = sizeof(PIIX3State),
.vmsd = &vmstate_piix3,
.no_user = 1,
.class_init = piix3_xen_class_init,
static TypeInfo piix3_xen_info = {
.name = "PIIX3-xen",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIX3State),
.class_init = piix3_xen_class_init,
};
static void i440fx_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->no_hotplug = 1;
@ -555,37 +560,40 @@ static void i440fx_class_init(ObjectClass *klass, void *data)
k->device_id = PCI_DEVICE_ID_INTEL_82441;
k->revision = 0x02;
k->class_id = PCI_CLASS_BRIDGE_HOST;
dc->desc = "Host bridge";
dc->no_user = 1;
dc->vmsd = &vmstate_i440fx;
}
static DeviceInfo i440fx_info = {
.name = "i440FX",
.desc = "Host bridge",
.size = sizeof(PCII440FXState),
.vmsd = &vmstate_i440fx,
.no_user = 1,
.class_init = i440fx_class_init,
static TypeInfo i440fx_info = {
.name = "i440FX",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCII440FXState),
.class_init = i440fx_class_init,
};
static void i440fx_pcihost_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = i440fx_pcihost_initfn;
dc->fw_name = "pci";
dc->no_user = 1;
}
static DeviceInfo i440fx_pcihost_info = {
.name = "i440FX-pcihost",
.fw_name = "pci",
.size = sizeof(I440FXState),
.no_user = 1,
.class_init = i440fx_pcihost_class_init,
static TypeInfo i440fx_pcihost_info = {
.name = "i440FX-pcihost",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(I440FXState),
.class_init = i440fx_pcihost_class_init,
};
static void i440fx_register(void)
{
pci_qdev_register(&i440fx_info);
pci_qdev_register(&piix3_info);
pci_qdev_register(&piix3_xen_info);
sysbus_register_withprop(&i440fx_pcihost_info);
type_register_static(&i440fx_info);
type_register_static(&piix3_info);
type_register_static(&piix3_xen_info);
type_register_static(&i440fx_pcihost_info);
}
device_init(i440fx_register);