aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2011-12-19 17:19:31 +1100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-19 10:27:33 -0600
commita3adb7ad3bd9c517d569e7e23b249e7f7d616015 (patch)
tree0c1406a66e4bd75d2598c431d310bd6e4e26f5f1 /vl.c
parent77bd1119ba43dbd0e73014037a08f8b49136bf6f (diff)
downloadqemu-a3adb7ad3bd9c517d569e7e23b249e7f7d616015.zip
qemu-a3adb7ad3bd9c517d569e7e23b249e7f7d616015.tar.gz
qemu-a3adb7ad3bd9c517d569e7e23b249e7f7d616015.tar.bz2
vl.c: In qemu -h output, only print options for the arch we are running as
Only print options in the help output that are accepted by our arch. This is less confusing for users and also for other programs that consume the help output. The options affected are: -g and -prom-env only displayed on PPC or SPARC -win2k-hack, -rtc-td-hack, -no-fd-bootchk, -no-acpi, -no-hpet, -acpitable, -smbios only displayed on i386 -semihosting only displayed on ARM, M68K or XTENSA -old-param only displayed on ARM Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/vl.c b/vl.c
index 25ec37b..da69f94 100644
--- a/vl.c
+++ b/vl.c
@@ -1492,24 +1492,21 @@ static void version(void)
static void help(int exitcode)
{
- const char *options_help =
+ version();
+ printf("usage: %s [options] [disk_image]\n\n"
+ "'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
+ error_get_progname());
+
#define QEMU_OPTIONS_GENERATE_HELP
#include "qemu-options-wrapper.h"
- ;
- version();
- printf("usage: %s [options] [disk_image]\n"
- "\n"
- "'disk_image' is a raw hard disk image for IDE hard disk 0\n"
- "\n"
- "%s\n"
- "During emulation, the following keys are useful:\n"
+
+ printf("\nDuring emulation, the following keys are useful:\n"
"ctrl-alt-f toggle full screen\n"
"ctrl-alt-n switch to virtual console 'n'\n"
"ctrl-alt toggle mouse and keyboard grab\n"
"\n"
- "When using -nographic, press 'ctrl-a h' to get some help.\n",
- error_get_progname(),
- options_help);
+ "When using -nographic, press 'ctrl-a h' to get some help.\n");
+
exit(exitcode);
}