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/cs4231a.c | |
| parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
| download | qemu-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/cs4231a.c')
| -rw-r--r-- | hw/cs4231a.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/hw/cs4231a.c b/hw/cs4231a.c index 811c76bbb3..811dda6516 100644 --- a/hw/cs4231a.c +++ b/hw/cs4231a.c @@ -665,28 +665,32 @@ int cs4231a_init (ISABus *bus) return 0; } +static Property cs4231a_properties[] = { + DEFINE_PROP_HEX32 ("iobase", CSState, port, 0x534), + DEFINE_PROP_UINT32 ("irq", CSState, irq, 9), + DEFINE_PROP_UINT32 ("dma", CSState, dma, 3), + DEFINE_PROP_END_OF_LIST (), +}; + static void cs4231a_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = cs4231a_initfn; + dc->desc = "Crystal Semiconductor CS4231A"; + dc->vmsd = &vmstate_cs4231a; + dc->props = cs4231a_properties; } -static DeviceInfo cs4231a_info = { - .name = "cs4231a", - .desc = "Crystal Semiconductor CS4231A", - .size = sizeof (CSState), - .vmsd = &vmstate_cs4231a, - .class_init = cs4231a_class_initfn, - .props = (Property[]) { - DEFINE_PROP_HEX32 ("iobase", CSState, port, 0x534), - DEFINE_PROP_UINT32 ("irq", CSState, irq, 9), - DEFINE_PROP_UINT32 ("dma", CSState, dma, 3), - DEFINE_PROP_END_OF_LIST (), - }, +static TypeInfo cs4231a_info = { + .name = "cs4231a", + .parent = TYPE_ISA_DEVICE, + .instance_size = sizeof (CSState), + .class_init = cs4231a_class_initfn, }; static void cs4231a_register (void) { - isa_qdev_register (&cs4231a_info); + type_register_static(&cs4231a_info); } device_init (cs4231a_register) |