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

@ -793,6 +793,7 @@ static Property ne2000_properties[] = {
static void ne2000_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = pci_ne2000_init;
@ -800,19 +801,20 @@ static void ne2000_class_init(ObjectClass *klass, void *data)
k->vendor_id = PCI_VENDOR_ID_REALTEK;
k->device_id = PCI_DEVICE_ID_REALTEK_8029;
k->class_id = PCI_CLASS_NETWORK_ETHERNET;
dc->vmsd = &vmstate_pci_ne2000;
dc->props = ne2000_properties;
}
static DeviceInfo ne2000_info = {
.name = "ne2k_pci",
.size = sizeof(PCINE2000State),
.vmsd = &vmstate_pci_ne2000,
.props = ne2000_properties,
.class_init = ne2000_class_init,
static TypeInfo ne2000_info = {
.name = "ne2k_pci",
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCINE2000State),
.class_init = ne2000_class_init,
};
static void ne2000_register_devices(void)
{
pci_qdev_register(&ne2000_info);
type_register_static(&ne2000_info);
}
device_init(ne2000_register_devices)