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/ivshmem.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'hw/ivshmem.c') diff --git a/hw/ivshmem.c b/hw/ivshmem.c index e2880be..6f017d4 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -779,6 +779,7 @@ static Property ivshmem_properties[] = { static void ivshmem_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = pci_ivshmem_init; @@ -786,19 +787,20 @@ static void ivshmem_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; k->device_id = 0x1110; k->class_id = PCI_CLASS_MEMORY_RAM; + dc->reset = ivshmem_reset; + dc->props = ivshmem_properties; } -static DeviceInfo ivshmem_info = { - .name = "ivshmem", - .size = sizeof(IVShmemState), - .reset = ivshmem_reset, - .props = ivshmem_properties, - .class_init = ivshmem_class_init, +static TypeInfo ivshmem_info = { + .name = "ivshmem", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(IVShmemState), + .class_init = ivshmem_class_init, }; static void ivshmem_register_devices(void) { - pci_qdev_register(&ivshmem_info); + type_register_static(&ivshmem_info); } device_init(ivshmem_register_devices) -- cgit v1.1