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/hda-audio.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/hda-audio.c')
-rw-r--r-- | hw/hda-audio.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/hw/hda-audio.c b/hw/hda-audio.c index 2b3ce2f..152f8e6 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c @@ -908,45 +908,49 @@ static int hda_audio_init_duplex(HDACodecDevice *hda) static void hda_audio_output_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); HDACodecDeviceClass *k = HDA_CODEC_DEVICE_CLASS(klass); k->init = hda_audio_init_output; k->exit = hda_audio_exit; k->command = hda_audio_command; k->stream = hda_audio_stream; + dc->desc = "HDA Audio Codec, output-only"; + dc->vmsd = &vmstate_hda_audio; + dc->props = hda_audio_properties; } -static DeviceInfo hda_audio_output_info = { - .name = "hda-output", - .desc = "HDA Audio Codec, output-only", - .size = sizeof(HDAAudioState), - .vmsd = &vmstate_hda_audio, - .props = hda_audio_properties, - .class_init = hda_audio_output_class_init, +static TypeInfo hda_audio_output_info = { + .name = "hda-output", + .parent = TYPE_HDA_CODEC_DEVICE, + .instance_size = sizeof(HDAAudioState), + .class_init = hda_audio_output_class_init, }; static void hda_audio_duplex_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); HDACodecDeviceClass *k = HDA_CODEC_DEVICE_CLASS(klass); k->init = hda_audio_init_duplex; k->exit = hda_audio_exit; k->command = hda_audio_command; k->stream = hda_audio_stream; + dc->desc = "HDA Audio Codec, duplex"; + dc->vmsd = &vmstate_hda_audio; + dc->props = hda_audio_properties; } -static DeviceInfo hda_audio_duplex_info = { - .name = "hda-duplex", - .desc = "HDA Audio Codec, duplex", - .size = sizeof(HDAAudioState), - .vmsd = &vmstate_hda_audio, - .props = hda_audio_properties, - .class_init = hda_audio_duplex_class_init, +static TypeInfo hda_audio_duplex_info = { + .name = "hda-duplex", + .parent = TYPE_HDA_CODEC_DEVICE, + .instance_size = sizeof(HDAAudioState), + .class_init = hda_audio_duplex_class_init, }; static void hda_audio_register(void) { - hda_codec_register(&hda_audio_output_info); - hda_codec_register(&hda_audio_duplex_info); + type_register_static(&hda_audio_output_info); + type_register_static(&hda_audio_duplex_info); } device_init(hda_audio_register); |