[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/23] soundhw: move help handling to vl.c
From: |
Paolo Bonzini |
Subject: |
[PULL 19/23] soundhw: move help handling to vl.c |
Date: |
Mon, 16 May 2022 17:55:59 +0200 |
This will allow processing "-audio model=help" even if the backend
part of the option is missing.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/audio/soundhw.c | 24 +++++++++---------------
softmmu/vl.c | 4 ++++
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index a1558dab3a..ebbd0958ba 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -89,23 +89,17 @@ void select_soundhw(const char *optarg)
error_setg(&error_fatal, "only one -soundhw option is allowed");
}
- if (is_help_option(optarg)) {
- show_valid_soundhw();
- exit(0);
+ for (c = soundhw; c->name; ++c) {
+ if (g_str_equal(c->name, optarg)) {
+ selected = c;
+ break;
+ }
}
- else {
- for (c = soundhw; c->name; ++c) {
- if (g_str_equal(c->name, optarg)) {
- selected = c;
- break;
- }
- }
- if (!c->name) {
- error_report("Unknown sound card name `%s'", optarg);
- show_valid_soundhw();
- exit(1);
- }
+ if (!c->name) {
+ error_report("Unknown sound card name `%s'", optarg);
+ show_valid_soundhw();
+ exit(1);
}
}
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 817d515783..0363cbd9b4 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2931,6 +2931,10 @@ void qemu_init(int argc, char **argv, char **envp)
audio_parse_option(optarg);
break;
case QEMU_OPTION_soundhw:
+ if (is_help_option(optarg)) {
+ show_valid_soundhw();
+ exit(0);
+ }
select_soundhw (optarg);
break;
case QEMU_OPTION_h:
--
2.36.0
- [PULL 11/23] target/i386: Enable Arch LBR migration states in vmstate, (continued)
- [PULL 11/23] target/i386: Enable Arch LBR migration states in vmstate, Paolo Bonzini, 2022/05/16
- [PULL 12/23] target/i386: introduce helper to access supported CPUID, Paolo Bonzini, 2022/05/16
- [PULL 13/23] target/i386: Support Arch LBR in CPUID enumeration, Paolo Bonzini, 2022/05/16
- [PULL 15/23] rng: make opened property read-only, Paolo Bonzini, 2022/05/16
- [PULL 16/23] soundhw: remove ability to create multiple soundcards, Paolo Bonzini, 2022/05/16
- [PULL 17/23] soundhw: extract soundhw help to a separate function, Paolo Bonzini, 2022/05/16
- [PULL 18/23] soundhw: unify initialization for ISA and PCI soundhw, Paolo Bonzini, 2022/05/16
- [PULL 23/23] configure: remove duplicate help messages, Paolo Bonzini, 2022/05/16
- [PULL 22/23] configure: remove another dead variable, Paolo Bonzini, 2022/05/16
- [PULL 14/23] crypto: make loaded property read-only, Paolo Bonzini, 2022/05/16
- [PULL 19/23] soundhw: move help handling to vl.c,
Paolo Bonzini <=
- [PULL 20/23] introduce -audio as a replacement for -soundhw, Paolo Bonzini, 2022/05/16
- [PULL 21/23] build: remove useless dependency, Paolo Bonzini, 2022/05/16
- Re: [PULL 00/23] Misc QEMU patches for 2022-05-16, Richard Henderson, 2022/05/16