From 39bffca2030950ef6efe57c2fac8327a45ae1015 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 7 Dec 2011 21:34:16 -0600 Subject: 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 --- hw/pcnet-pci.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'hw/pcnet-pci.c') diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index be3bd79ae8..439f32caae 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -355,6 +355,7 @@ static Property pcnet_properties[] = { static void pcnet_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_pcnet_init; @@ -363,20 +364,21 @@ static void pcnet_class_init(ObjectClass *klass, void *data) k->device_id = PCI_DEVICE_ID_AMD_LANCE; k->revision = 0x10; k->class_id = PCI_CLASS_NETWORK_ETHERNET; + dc->reset = pci_reset; + dc->vmsd = &vmstate_pci_pcnet; + dc->props = pcnet_properties; } -static DeviceInfo pcnet_info = { - .name = "pcnet", - .size = sizeof(PCIPCNetState), - .reset = pci_reset, - .vmsd = &vmstate_pci_pcnet, - .props = pcnet_properties, - .class_init = pcnet_class_init, +static TypeInfo pcnet_info = { + .name = "pcnet", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIPCNetState), + .class_init = pcnet_class_init, }; static void pci_pcnet_register_devices(void) { - pci_qdev_register(&pcnet_info); + type_register_static(&pcnet_info); } device_init(pci_pcnet_register_devices) -- cgit v1.2.1