summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-09-19 14:51:38 +0100
committermalc <av1474@comtv.ru>2012-09-19 17:55:08 +0400
commit55d4fd3c24bd253bd96270c7fdf1bb862f3a3400 (patch)
tree22bee3d8c8f9ce820ba9ab71329888d69966dd0d
parent6b80f7db8a7f84d21e46d01e30c8497733bb23a0 (diff)
downloadfocaccia-qemu-55d4fd3c24bd253bd96270c7fdf1bb862f3a3400.tar.gz
focaccia-qemu-55d4fd3c24bd253bd96270c7fdf1bb862f3a3400.zip
arch_init.c: Improve '-soundhw help' for non-HAS_AUDIO_CHOICE archs
For architectures which don't set HAS_AUDIO_CHOICE, improve the
'-soundhw help' message so that it doesn't simply print an empty
list, implying no sound support at all.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: malc <av1474@comtv.ru>
-rw-r--r--arch_init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch_init.c b/arch_init.c
index 47977de7c6..f849f9b872 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -922,11 +922,16 @@ void select_soundhw(const char *optarg)
     if (is_help_option(optarg)) {
     show_valid_cards:
 
+#ifdef HAS_AUDIO_CHOICE
         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");
+#endif
         exit(!is_help_option(optarg));
     }
     else {