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/qxl.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'hw/qxl.c') diff --git a/hw/qxl.c b/hw/qxl.c index 2f9470f..bc03c1d 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1826,6 +1826,7 @@ static Property qxl_properties[] = { static void qxl_primary_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->no_hotplug = 1; @@ -1834,42 +1835,45 @@ static void qxl_primary_class_init(ObjectClass *klass, void *data) k->vendor_id = REDHAT_PCI_VENDOR_ID; k->device_id = QXL_DEVICE_ID_STABLE; k->class_id = PCI_CLASS_DISPLAY_VGA; + dc->desc = "Spice QXL GPU (primary, vga compatible)"; + dc->reset = qxl_reset_handler; + dc->vmsd = &qxl_vmstate; + dc->props = qxl_properties; } -static DeviceInfo qxl_primary_info = { - .name = "qxl-vga", - .desc = "Spice QXL GPU (primary, vga compatible)", - .size = sizeof(PCIQXLDevice), - .reset = qxl_reset_handler, - .vmsd = &qxl_vmstate, - .props = qxl_properties, - .class_init = qxl_primary_class_init, +static TypeInfo qxl_primary_info = { + .name = "qxl-vga", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIQXLDevice), + .class_init = qxl_primary_class_init, }; static void qxl_secondary_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = qxl_init_secondary; k->vendor_id = REDHAT_PCI_VENDOR_ID; k->device_id = QXL_DEVICE_ID_STABLE; k->class_id = PCI_CLASS_DISPLAY_OTHER; + dc->desc = "Spice QXL GPU (secondary)"; + dc->reset = qxl_reset_handler; + dc->vmsd = &qxl_vmstate; + dc->props = qxl_properties; } -static DeviceInfo qxl_secondary_info = { - .name = "qxl", - .desc = "Spice QXL GPU (secondary)", - .size = sizeof(PCIQXLDevice), - .reset = qxl_reset_handler, - .vmsd = &qxl_vmstate, - .props = qxl_properties, - .class_init = qxl_secondary_class_init, +static TypeInfo qxl_secondary_info = { + .name = "qxl", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIQXLDevice), + .class_init = qxl_secondary_class_init, }; static void qxl_register(void) { - pci_qdev_register(&qxl_primary_info); - pci_qdev_register(&qxl_secondary_info); + type_register_static(&qxl_primary_info); + type_register_static(&qxl_secondary_info); } device_init(qxl_register); -- cgit v1.1