From: Marc-André Lureau <marcandre.lureau@redhat.com>
For readability.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
audio/audio.h | 4 ++--
audio/audio.c | 8 ++++----
system/vl.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/audio/audio.h b/audio/audio.h
index fcc22307be..eb5b5d662d 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -168,8 +168,8 @@ void audio_sample_to_uint64(const void *samples, int pos,
void audio_sample_from_uint64(void *samples, int pos,
uint64_t left, uint64_t right);
-void audio_define(Audiodev *audio);
-void audio_define_default(Audiodev *dev, Error **errp);
+void audio_add_audiodev(Audiodev *audio);
+void audio_add_default_audiodev(Audiodev *dev, Error **errp);
void audio_parse_option(const char *opt);
void audio_create_default_audiodevs(void);
void audio_init_audiodevs(void);
diff --git a/audio/audio.c b/audio/audio.c
index 89f091bc88..6197fa1788 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1712,7 +1712,7 @@ void audio_create_default_audiodevs(void)
visit_type_Audiodev(v, NULL, &dev, &error_fatal);
visit_free(v);
- audio_define_default(dev, &error_abort);
+ audio_add_default_audiodev(dev, &error_abort);
}
}
}
@@ -2142,10 +2142,10 @@ void audio_parse_option(const char *opt)
visit_type_Audiodev(v, NULL, &dev, &error_fatal);
visit_free(v);
- audio_define(dev);
+ audio_add_audiodev(dev);
}
-void audio_define(Audiodev *dev)
+void audio_add_audiodev(Audiodev *dev)
{
AudiodevListEntry *e;
@@ -2156,7 +2156,7 @@ void audio_define(Audiodev *dev)
QSIMPLEQ_INSERT_TAIL(&audiodevs, e, next);
}
-void audio_define_default(Audiodev *dev, Error **errp)
+void audio_add_default_audiodev(Audiodev *dev, Error **errp)
{
AudiodevListEntry *e;
diff --git a/system/vl.c b/system/vl.c
index d20a9cbe08..7187b24449 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2264,7 +2264,7 @@ static void qemu_record_config_group(const char *group, QDict *dict,
Audiodev *dev = NULL;
Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(dict));
if (visit_type_Audiodev(v, NULL, &dev, errp)) {
- audio_define(dev);
+ audio_add_audiodev(dev);
}
visit_free(v);
@@ -3086,11 +3086,11 @@ void qemu_init(int argc, char **argv)
visit_type_Audiodev(v, NULL, &dev, &error_fatal);
visit_free(v);
if (model) {
- audio_define(dev);
+ audio_add_audiodev(dev);
select_soundhw(model, dev->id);
g_free(model);
} else {
- audio_define_default(dev, &error_fatal);
+ audio_add_default_audiodev(dev, &error_fatal);
}
break;
}
--
2.51.0