[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/9] vl: recognize audiodev groups in configuration files
From: |
Paolo Bonzini |
Subject: |
[PATCH 7/9] vl: recognize audiodev groups in configuration files |
Date: |
Fri, 22 Sep 2023 11:44:57 +0200 |
This is necessary for the q35 configuration tests to pass,
once audiodev becomes mandatory.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
docs/config/q35-emulated.cfg | 4 ++++
docs/config/q35-virtio-graphical.cfg | 4 ++++
softmmu/vl.c | 10 ++++++++++
3 files changed, 18 insertions(+)
diff --git a/docs/config/q35-emulated.cfg b/docs/config/q35-emulated.cfg
index c8806e6d362..b4bd7e858a9 100644
--- a/docs/config/q35-emulated.cfg
+++ b/docs/config/q35-emulated.cfg
@@ -288,3 +288,7 @@
driver = "hda-duplex"
bus = "ich9-hda-audio.0"
cad = "0"
+ audiodev = "audiodev0"
+
+[audiodev "audiodev0"]
+ driver = "none" # CHANGE ME
diff --git a/docs/config/q35-virtio-graphical.cfg
b/docs/config/q35-virtio-graphical.cfg
index 148b5d2c5e4..820860aefe0 100644
--- a/docs/config/q35-virtio-graphical.cfg
+++ b/docs/config/q35-virtio-graphical.cfg
@@ -248,3 +248,7 @@
driver = "hda-duplex"
bus = "sound.0"
cad = "0"
+ audiodev = "audiodev0"
+
+[audiodev "audiodev0"]
+ driver = "none" # CHANGE ME
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 70c9eb34dcf..f74fc3d3e40 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2125,6 +2125,7 @@ static int global_init_func(void *opaque, QemuOpts *opts,
Error **errp)
static bool is_qemuopts_group(const char *group)
{
if (g_str_equal(group, "object") ||
+ g_str_equal(group, "audiodev") ||
g_str_equal(group, "machine") ||
g_str_equal(group, "smp-opts") ||
g_str_equal(group, "boot-opts")) {
@@ -2140,6 +2141,15 @@ static void qemu_record_config_group(const char *group,
QDict *dict,
Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(dict));
object_option_add_visitor(v);
visit_free(v);
+
+ } else if (g_str_equal(group, "audiodev")) {
+ Audiodev *dev = NULL;
+ Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(dict));
+ if (visit_type_Audiodev(v, NULL, &dev, errp)) {
+ audio_define(dev);
+ }
+ visit_free(v);
+
} else if (g_str_equal(group, "machine")) {
/*
* Cannot merge string-valued and type-safe dictionaries, so JSON
--
2.41.0
- [PATCH 0/9] audio: make sound cards require the audiodev property, Paolo Bonzini, 2023/09/22
- [PATCH 1/9] audio: Add easy dummy audio initialiser, Paolo Bonzini, 2023/09/22
- [PATCH 3/9] vl: support -audio BACKEND without model, Paolo Bonzini, 2023/09/22
- [PATCH 5/9] hw/ppc: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/09/22
- [PATCH 2/9] Introduce machine property "audiodev", Paolo Bonzini, 2023/09/22
- [PATCH 4/9] hw/arm: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/09/22
- [PATCH 7/9] vl: recognize audiodev groups in configuration files,
Paolo Bonzini <=
- [PATCH 8/9] audio: Make AUD_register_card fallible and require audiodev=, Paolo Bonzini, 2023/09/22
- [PATCH 9/9] audio: Be more strict during audio backend initialisation, Paolo Bonzini, 2023/09/22
- [PATCH 6/9] vt82c686: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/09/22