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/ne2000-isa.c | |
| parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
| download | 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/ne2000-isa.c')
| -rw-r--r-- | hw/ne2000-isa.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 25a7a31d25..1352282152 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -82,27 +82,31 @@ static int isa_ne2000_initfn(ISADevice *dev) return 0; } +static Property ne2000_isa_properties[] = { + DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), + DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), + DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), + DEFINE_PROP_END_OF_LIST(), +}; + static void isa_ne2000_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = isa_ne2000_initfn; + dc->props = ne2000_isa_properties; } -static DeviceInfo ne2000_isa_info = { - .name = "ne2k_isa", - .size = sizeof(ISANE2000State), - .class_init = isa_ne2000_class_initfn, - .props = (Property[]) { - DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), - DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), - DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), - DEFINE_PROP_END_OF_LIST(), - }, +static TypeInfo ne2000_isa_info = { + .name = "ne2k_isa", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof(ISANE2000State), + .class_init = isa_ne2000_class_initfn, }; static void ne2000_isa_register_devices(void) { - isa_qdev_register(&ne2000_isa_info); + type_register_static(&ne2000_isa_info); } device_init(ne2000_isa_register_devices) |