diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-07 21:34:16 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-03 10:41:06 -0600 |
commit | 39bffca2030950ef6efe57c2fac8327a45ae1015 (patch) | |
tree | 325262f44978e6116c9e43f688c900e08ee83738 /hw/opencores_eth.c | |
parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
download | hqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip hqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz |
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/opencores_eth.c')
-rw-r--r-- | hw/opencores_eth.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c index 1f45506..09f2757 100644 --- a/hw/opencores_eth.c +++ b/hw/opencores_eth.c @@ -734,23 +734,25 @@ static Property open_eth_properties[] = { static void open_eth_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = sysbus_open_eth_init; + dc->desc = "Opencores 10/100 Mbit Ethernet"; + dc->reset = qdev_open_eth_reset; + dc->props = open_eth_properties; } -static DeviceInfo open_eth_info = { - .name = "open_eth", - .desc = "Opencores 10/100 Mbit Ethernet", - .size = sizeof(OpenEthState), - .reset = qdev_open_eth_reset, - .props = open_eth_properties, - .class_init = open_eth_class_init, +static TypeInfo open_eth_info = { + .name = "open_eth", + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(OpenEthState), + .class_init = open_eth_class_init, }; static void open_eth_register_devices(void) { - sysbus_register_withprop(&open_eth_info); + type_register_static(&open_eth_info); } device_init(open_eth_register_devices) |