Remove the audio and audiodev runtime options when QEMU is configured with `--disable-audio`.
Signed-off-by: Sergei Heifetz <[email protected]> --- qemu-options.hx | 2 ++ system/vl.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 04ea2239296..29dc865820a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -788,6 +788,7 @@ SRST ERST +#ifdef CONFIG_AUDIO DEF("audio", HAS_ARG, QEMU_OPTION_audio, "-audio [driver=]driver[,prop=value[,...]]\n" " specifies default audio backend when `audiodev` is not\n" @@ -1109,6 +1110,7 @@ SRST Write recorded audio into the specified file. Default is ``qemu.wav``. ERST +#endif DEF("device", HAS_ARG, QEMU_OPTION_device, "-device driver[,prop=value[,...]]\n" diff --git a/system/vl.c b/system/vl.c index 38d7b849e0a..9ed0285c47a 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2250,7 +2250,9 @@ 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") || +#ifdef CONFIG_AUDIO g_str_equal(group, "audiodev") || +#endif g_str_equal(group, "machine") || g_str_equal(group, "smp-opts") || g_str_equal(group, "boot-opts")) { @@ -2267,6 +2269,7 @@ static void qemu_record_config_group(const char *group, QDict *dict, object_option_add_visitor(v); visit_free(v); +#ifdef CONFIG_AUDIO } else if (g_str_equal(group, "audiodev")) { Audiodev *dev = NULL; Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(dict)); @@ -2274,6 +2277,7 @@ static void qemu_record_config_group(const char *group, QDict *dict, audio_add_audiodev(dev); } visit_free(v); +#endif } else if (g_str_equal(group, "machine")) { /* @@ -3059,6 +3063,7 @@ void qemu_init(int argc, char **argv) } break; #endif +#ifdef CONFIG_AUDIO case QEMU_OPTION_audiodev: default_audio = 0; audio_parse_option(optarg); @@ -3099,6 +3104,7 @@ void qemu_init(int argc, char **argv) } break; } +#endif case QEMU_OPTION_h: help(0); break; -- 2.34.1
