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 | |
| 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>
| -rw-r--r-- | qemu-options.hx | 4 | ||||
| -rw-r--r-- | vl.c | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 2fa9ed48e5..bb2d4fa5be 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -430,7 +430,7 @@ Also optionally set the top visible process name in Linux. ETEXI DEF("uuid", HAS_ARG, QEMU_OPTION_uuid, - "-uuid %%08x-%%04x-%%04x-%%04x-%%012x\n" + "-uuid %08x-%04x-%04x-%04x-%012x\n" " specify machine UUID\n") STEXI @item -uuid @var{uuid} @@ -773,7 +773,7 @@ ETEXI DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, "-smbios file=binary\n" " load SMBIOS entry from binary file\n" - "-smbios type=0[,vendor=str][,version=str][,date=str][,release=%%d.%%d]\n" + "-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d]\n" " specify SMBIOS type 0 fields\n" "-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]\n" " [,uuid=uuid][,sku=str][,family=str]\n" @@ -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); } |