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/xio3130_downstream.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'hw/xio3130_downstream.c') diff --git a/hw/xio3130_downstream.c b/hw/xio3130_downstream.c index 6d625cb5d6..07e4fc1018 100644 --- a/hw/xio3130_downstream.c +++ b/hw/xio3130_downstream.c @@ -179,6 +179,7 @@ static Property xio3130_downstream_properties[] = { static void xio3130_downstream_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->is_express = 1; @@ -189,21 +190,22 @@ static void xio3130_downstream_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_TI; k->device_id = PCI_DEVICE_ID_TI_XIO3130D; k->revision = XIO3130_REVISION; + dc->desc = "TI X3130 Downstream Port of PCI Express Switch"; + dc->reset = xio3130_downstream_reset; + dc->vmsd = &vmstate_xio3130_downstream; + dc->props = xio3130_downstream_properties; } -static DeviceInfo xio3130_downstream_info = { - .name = "xio3130-downstream", - .desc = "TI X3130 Downstream Port of PCI Express Switch", - .size = sizeof(PCIESlot), - .reset = xio3130_downstream_reset, - .vmsd = &vmstate_xio3130_downstream, - .props = xio3130_downstream_properties, - .class_init = xio3130_downstream_class_init, +static TypeInfo xio3130_downstream_info = { + .name = "xio3130-downstream", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIESlot), + .class_init = xio3130_downstream_class_init, }; static void xio3130_downstream_register(void) { - pci_qdev_register(&xio3130_downstream_info); + type_register_static(&xio3130_downstream_info); } device_init(xio3130_downstream_register); -- cgit v1.2.3