diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2010-02-04 16:49:59 +0100 |
---|---|---|
committer | malc <av1474@comtv.ru> | 2010-02-08 12:12:40 +0300 |
commit | e8105ebb94bf8c79c8ee8a66df5e8dfaabbfdbe1 (patch) | |
tree | 5eea89583321e90330e4a48663ff99a5583c370f /vl.c | |
parent | bec7c2d4148fd4e212265ea21eb2cb66b762611f (diff) |
vl.c: avoid preprocessor directives in a printf call
Similar to the qemu-img.c patch, but I also have to unescape remaining
% signs in qemu-options.hx.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -4021,11 +4021,7 @@ static void version(void) static void help(int exitcode) { - version(); - printf("usage: %s [options] [disk_image]\n" - "\n" - "'disk_image' is a raw hard image image for IDE hard disk 0\n" - "\n" + const char *options_help = #define DEF(option, opt_arg, opt_enum, opt_help) \ opt_help #define DEFHEADING(text) stringify(text) "\n" @@ -4033,15 +4029,21 @@ static void help(int exitcode) #undef DEF #undef DEFHEADING #undef GEN_DOCS + ; + version(); + printf("usage: %s [options] [disk_image]\n" + "\n" + "'disk_image' is a raw hard image image for IDE hard disk 0\n" "\n" + "%s\n" "During 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" - , - "qemu"); + "When using -nographic, press 'ctrl-a h' to get some help.\n", + "qemu", + options_help); exit(exitcode); } |