[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/26] audio: extend -audio to allow creating a default backend
From: |
Paolo Bonzini |
Subject: |
[PULL 23/26] audio: extend -audio to allow creating a default backend |
Date: |
Fri, 6 Oct 2023 13:14:09 +0200 |
If "-audio BACKEND" is used without a model, the resulting backend
will be used whenever the audiodev property is not specified.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/audio.c | 2 +-
qemu-options.hx | 29 +++++++++++++++++++++--------
system/vl.c | 27 +++++++++++++++------------
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 887219e0ce4..a5e6eb4952e 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1820,7 +1820,7 @@ bool AUD_register_card (const char *name, QEMUSoundCard
*card, Error **errp)
card->state = audio_init(NULL, errp);
if (!card->state) {
if (!QSIMPLEQ_EMPTY(&audiodevs)) {
- error_append_hint(errp, "Perhaps you wanted to set
audiodev=%s?\n",
+ error_append_hint(errp, "Perhaps you wanted to use -audio
or set audiodev=%s?\n",
QSIMPLEQ_FIRST(&audiodevs)->dev->id);
}
return false;
diff --git a/qemu-options.hx b/qemu-options.hx
index 9ce8a5b9578..5f4c240a1e2 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -728,20 +728,22 @@ ERST
DEF("audio", HAS_ARG, QEMU_OPTION_audio,
+ "-audio [driver=]driver[,prop[=value][,...]]\n"
+ " specifies default audio backend when `audiodev` is not\n"
+ " used to create a machine or sound device;"
+ " options are the same as for -audiodev\n"
"-audio [driver=]driver,model=value[,prop[=value][,...]]\n"
" specifies the audio backend and device to use;\n"
" apart from 'model', options are the same as for
-audiodev.\n"
" use '-audio model=help' to show possible devices.\n",
QEMU_ARCH_ALL)
SRST
-``-audio [driver=]driver,model=value[,prop[=value][,...]]``
- This option is a shortcut for configuring both the guest audio
- hardware and the host audio backend in one go.
- The driver option is the same as with the corresponding ``-audiodev``
option below.
- The guest hardware model can be set with ``model=modelname``.
-
- Use ``driver=help`` to list the available drivers,
- and ``model=help`` to list the available device types.
+``-audio [driver=]driver[,model=value][,prop[=value][,...]]``
+ If the ``model`` option is specified, ``-audio`` is a shortcut
+ for configuring both the guest audio hardware and the host audio
+ backend in one go. The guest hardware model can be set with
+ ``model=modelname``. Use ``model=help`` to list the available
+ device types.
The following two example do exactly the same, to show how ``-audio``
can be used to shorten the command line length:
@@ -750,6 +752,17 @@ SRST
|qemu_system| -audiodev pa,id=pa -device sb16,audiodev=pa
|qemu_system| -audio pa,model=sb16
+
+ If the ``model`` option is not specified, ``-audio`` is used to
+ configure a default audio backend that will be used whenever the
+ ``audiodev`` property is not set on a device or machine. In
+ particular, ``-audio none`` ensures that no audio is produced even
+ for machines that have embedded sound hardware.
+
+ In both cases, the driver option is the same as with the corresponding
+ ``-audiodev`` option below. Use ``driver=help`` to list the available
+ drivers.
+
ERST
DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
diff --git a/system/vl.c b/system/vl.c
index 7ca92d4490d..72be5a49764 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2935,7 +2935,7 @@ void qemu_init(int argc, char **argv)
break;
case QEMU_OPTION_audio: {
bool help;
- char *model;
+ char *model = NULL;
Audiodev *dev = NULL;
Visitor *v;
QDict *dict = keyval_parse(optarg, "driver", &help,
&error_fatal);
@@ -2948,22 +2948,25 @@ void qemu_init(int argc, char **argv)
if (!qdict_haskey(dict, "id")) {
qdict_put_str(dict, "id", "audiodev0");
}
- if (!qdict_haskey(dict, "model")) {
- error_setg(&error_fatal, "Parameter 'model' is missing");
- }
- model = g_strdup(qdict_get_str(dict, "model"));
- qdict_del(dict, "model");
- if (is_help_option(model)) {
- show_valid_soundhw();
- exit(0);
+ if (qdict_haskey(dict, "model")) {
+ model = g_strdup(qdict_get_str(dict, "model"));
+ qdict_del(dict, "model");
+ if (is_help_option(model)) {
+ show_valid_soundhw();
+ exit(0);
+ }
}
v = qobject_input_visitor_new_keyval(QOBJECT(dict));
qobject_unref(dict);
visit_type_Audiodev(v, NULL, &dev, &error_fatal);
visit_free(v);
- audio_define(dev);
- select_soundhw(model, dev->id);
- g_free(model);
+ if (model) {
+ audio_define(dev);
+ select_soundhw(model, dev->id);
+ g_free(model);
+ } else {
+ audio_define_default(dev, &error_fatal);
+ }
break;
}
case QEMU_OPTION_h:
--
2.41.0
- [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch, (continued)
- [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch, Paolo Bonzini, 2023/10/06
- [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system', Paolo Bonzini, 2023/10/06
- [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system', Paolo Bonzini, 2023/10/06
- [PULL 17/26] system: Rename softmmu/ directory as system/, Paolo Bonzini, 2023/10/06
- [PULL 19/26] cutils: squelch compiler warnings with custom paths, Paolo Bonzini, 2023/10/06
- [PULL 20/26] audio: error hints need a trailing \n, Paolo Bonzini, 2023/10/06
- [PULL 18/26] configure: change $softmmu to $system, Paolo Bonzini, 2023/10/06
- [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss, Paolo Bonzini, 2023/10/06
- [PULL 15/26] meson: Rename softmmu_mods -> system_mods, Paolo Bonzini, 2023/10/06
- [PULL 21/26] audio: disable default backends if -audio/-audiodev is used, Paolo Bonzini, 2023/10/06
- [PULL 23/26] audio: extend -audio to allow creating a default backend,
Paolo Bonzini <=
- [PULL 24/26] audio: do not use first -audiodev as default audio device, Paolo Bonzini, 2023/10/06
- [PULL 14/26] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss, Paolo Bonzini, 2023/10/06
- [PULL 22/26] audio: extract audio_define_default, Paolo Bonzini, 2023/10/06
- [PULL 25/26] audio: reintroduce default audio backend for VNC, Paolo Bonzini, 2023/10/06
- [PULL 26/26] audio, qtest: get rid of QEMU_AUDIO_DRV, Paolo Bonzini, 2023/10/06
- Re: [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06, Paolo Bonzini, 2023/10/08