summaryrefslogtreecommitdiffstats
path: root/hw/xilinx_axidma.c
diff options
context:
space:
mode:
authorAnthony Liguori2011-12-08 04:34:16 +0100
committerAnthony Liguori2012-02-03 17:41:06 +0100
commit39bffca2030950ef6efe57c2fac8327a45ae1015 (patch)
tree325262f44978e6116c9e43f688c900e08ee83738 /hw/xilinx_axidma.c
parentqdev: kill off DeviceInfo list (diff)
downloadqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz
qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.xz
qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip
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>
Diffstat (limited to 'hw/xilinx_axidma.c')
-rw-r--r--hw/xilinx_axidma.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 0fbe415d4b..e8a53123f9 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -494,21 +494,23 @@ static Property axidma_properties[] = {
static void axidma_class_init(ObjectClass *klass, void *data)
{
+ DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = xilinx_axidma_init;
+ dc->props = axidma_properties;
}
-static DeviceInfo axidma_info = {
- .name = "xilinx,axidma",
- .size = sizeof(struct XilinxAXIDMA),
- .props = axidma_properties,
- .class_init = axidma_class_init,
+static TypeInfo axidma_info = {
+ .name = "xilinx,axidma",
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(struct XilinxAXIDMA),
+ .class_init = axidma_class_init,
};
static void xilinx_axidma_register(void)
{
- sysbus_register_withprop(&axidma_info);
+ type_register_static(&axidma_info);
}
device_init(xilinx_axidma_register)