[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 5/6] soundhw: move help handling to vl.c
From: |
Paolo Bonzini |
Subject: |
[RFC PATCH 5/6] soundhw: move help handling to vl.c |
Date: |
Wed, 27 Apr 2022 13:32:24 +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 a9d8807b18..d81ae91136 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 c2919579fd..5bea0eb3eb 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3019,6 +3019,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.35.1
- [RFC PATCH 0/6] replace -soundhw with -audio, Paolo Bonzini, 2022/04/27
- [RFC PATCH 1/6] pc: remove -soundhw pcspk, Paolo Bonzini, 2022/04/27
- [RFC PATCH 3/6] soundhw: extract soundhw help to a separate function, Paolo Bonzini, 2022/04/27
- [RFC PATCH 4/6] soundhw: unify initialization for ISA and PCI soundhw, Paolo Bonzini, 2022/04/27
- [RFC PATCH 6/6] vl: introduce -audio as a replacement for -soundhw, Paolo Bonzini, 2022/04/27
- [RFC PATCH 2/6] soundhw: remove ability to create multiple soundcards, Paolo Bonzini, 2022/04/27
- [RFC PATCH 5/6] soundhw: move help handling to vl.c,
Paolo Bonzini <=