motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-25 19:13:26 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

soundhw: extract soundhw help to a separate function

Browse source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-04-27 12:26:48 +02:00
parent 9c50b8aae2
commit eef5fdf3d5
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
hw/audio/soundhw.c
View file

@ -64,6 +64,21 @@ void deprecated_register_soundhw(const char *name, const char *descr,
soundhw_count++; soundhw_count++;
} }
void show_valid_soundhw(void)
{
struct soundhw *c;
if (soundhw_count) {
printf("Valid sound card names (comma separated):\n");
for (c = soundhw; c->name; ++c) {
printf ("%-11s %s\n", c->name, c->descr);
}
} else {
printf("Machine has no user-selectable audio hardware "
"(it may or may not have always-present audio hardware).\n");
}
}
static struct soundhw *selected = NULL; static struct soundhw *selected = NULL;
void select_soundhw(const char *optarg) void select_soundhw(const char *optarg)
@ -75,19 +90,8 @@ void select_soundhw(const char *optarg)
} }
if (is_help_option(optarg)) { if (is_help_option(optarg)) {
show_valid_cards: show_valid_soundhw();
exit(0);
if (soundhw_count) {
printf("Valid sound card names (comma separated):\n");
for (c = soundhw; c->name; ++c) {
printf ("%-11s %s\n", c->name, c->descr);
}
printf("\n-soundhw all will enable all of the above\n");
} else {
printf("Machine has no user-selectable audio hardware "
"(it may or may not have always-present audio hardware).\n");
}
exit(!is_help_option(optarg));
} }
else { else {
for (c = soundhw; c->name; ++c) { for (c = soundhw; c->name; ++c) {
@ -99,7 +103,8 @@ void select_soundhw(const char *optarg)
if (!c->name) { if (!c->name) {
error_report("Unknown sound card name `%s'", optarg); error_report("Unknown sound card name `%s'", optarg);
goto show_valid_cards; show_valid_soundhw();
exit(1);
} }
} }
} }

1
include/hw/audio/soundhw.h
View file

@ -7,6 +7,7 @@ void deprecated_register_soundhw(const char *name, const char *descr,
int isa, const char *typename); int isa, const char *typename);
void soundhw_init(void); void soundhw_init(void);
void show_valid_soundhw(void);
void select_soundhw(const char *optarg); void select_soundhw(const char *optarg);
#endif #endif