fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: start making AudioState a QOM Object

Browse source 
QOM brings some conveniences for introspection, type checking, reference
counting, interfaces etc. This is only the first step to introduce QOM
in audio/ (I have more in the pipeline)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Marc-André Lureau 2025-10-13 17:38:42 +04:00
parent 5fb347dea0
commit f991647ed4
3 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
audio/audio.c
View file

@ -1617,8 +1617,19 @@ static void audio_vm_change_state_handler (void *opaque, bool running,
audio_reset_timer (s);
}
static void free_audio_state(AudioState *s)
static void audio_state_init(Object *obj)
{
AudioState *s = AUDIO_STATE(obj);
QLIST_INIT(&s->hw_head_out);
QLIST_INIT(&s->hw_head_in);
QLIST_INIT(&s->cap_head);
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
}
static void audio_state_finalize(Object *obj)
{
AudioState *s = AUDIO_STATE(obj);
HWVoiceOut *hwo, *hwon;
HWVoiceIn *hwi, *hwin;
@ -1663,8 +1674,6 @@ static void free_audio_state(AudioState *s)
timer_free(s->ts);
s->ts = NULL;
}
g_free(s);
}
void audio_cleanup(void)
@ -1673,7 +1682,7 @@ void audio_cleanup(void)
while (!QTAILQ_EMPTY(&audio_states)) {
AudioState *s = QTAILQ_FIRST(&audio_states);
QTAILQ_REMOVE(&audio_states, s, list);
free_audio_state(s);
object_unref(s);
}
}
@ -1732,18 +1741,13 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
AudioState *s;
struct audio_driver *driver;
s = g_new0(AudioState, 1);
s = AUDIO_STATE(object_new(TYPE_AUDIO_STATE));
QLIST_INIT (&s->hw_head_out);
QLIST_INIT (&s->hw_head_in);
QLIST_INIT (&s->cap_head);
if (!atexit_registered) {
atexit(audio_cleanup);
atexit_registered = true;
}
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
if (dev) {
/* -audiodev option */
s->dev = dev;
@ -1796,7 +1800,7 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
return s;
out:
free_audio_state(s);
object_unref(s);
return NULL;
}
@ -2320,3 +2324,20 @@ AudiodevList *qmp_query_audiodevs(Error **errp)
}
return ret;
}
static const TypeInfo audio_state_info = {
.name = TYPE_AUDIO_STATE,
.parent = TYPE_OBJECT,
.instance_size = sizeof(AudioState),
.instance_init = audio_state_init,
.instance_finalize = audio_state_finalize,
.abstract = false, /* TODO: subclass drivers and make it abstract */
.class_size = sizeof(AudioStateClass),
};
static void register_types(void)
{
type_register_static(&audio_state_info);
}
type_init(register_types);

7
audio/audio.h
View file

@ -80,6 +80,10 @@ typedef struct SWVoiceOut SWVoiceOut;
typedef struct CaptureVoiceOut CaptureVoiceOut;
typedef struct SWVoiceIn SWVoiceIn;
struct AudioStateClass {
ObjectClass parent_class;
};
typedef struct AudioState AudioState;
typedef struct QEMUSoundCard {
char *name;
@ -182,4 +186,7 @@ const char *audio_get_id(QEMUSoundCard *card);
#define DEFINE_AUDIO_PROPERTIES(_s, _f) \
DEFINE_PROP_AUDIODEV("audiodev", _s, _f)
#define TYPE_AUDIO_STATE "audio-state"
OBJECT_DECLARE_TYPE(AudioState, AudioStateClass, AUDIO_STATE)
#endif /* QEMU_AUDIO_H */

2
audio/audio_int.h
View file

@ -217,6 +217,8 @@ struct SWVoiceCap {
};
typedef struct AudioState {
Object parent;
struct audio_driver *drv;
Audiodev *dev;
void *drv_opaque;