[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] vl.c: avoid preprocessor directives in a printf
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 4/4] vl.c: avoid preprocessor directives in a printf call |
Date: |
Thu, 4 Feb 2010 16:49:59 +0100 |
Similar to the qemu-img.c patch, but I also have to unescape remaining
% signs in qemu-options.hx.
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-options.hx | 4 ++--
vl.c | 18 ++++++++++--------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 2fa9ed4..bb2d4fa 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"
diff --git a/vl.c b/vl.c
index 3d2de7b..057046e 100644
--- a/vl.c
+++ b/vl.c
@@ -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);
}
--
1.6.6
- [Qemu-devel] Re: "Enable _FORTIFY_SOURCE=2" result in building failure for qemu-img.c, (continued)
- [Qemu-devel] Re: "Enable _FORTIFY_SOURCE=2" result in building failure for qemu-img.c, Juan Quintela, 2010/02/04
- [Qemu-devel] [PATCH] qemu-img: avoid preprocessor directives in a printf call, Paolo Bonzini, 2010/02/04
- [Qemu-devel] Re: [PATCH] qemu-img: avoid preprocessor directives in a printf call, Sheng Yang, 2010/02/04
- [Qemu-devel] [PATCH 0/4] Fix printf calls embedding preprocessor directives, Paolo Bonzini, 2010/02/04
- [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives, Sheng Yang, 2010/02/04
- Re: [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives, Kevin Wolf, 2010/02/05
- [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives, Paolo Bonzini, 2010/02/05
- [Qemu-devel] [PATCH 1/4] qemu-img: avoid preprocessor directives in a printf call, Paolo Bonzini, 2010/02/04
- [Qemu-devel] [PATCH 2/4] cope with printf macro definition in readline.c, Paolo Bonzini, 2010/02/04
- [Qemu-devel] [PATCH 3/4] do not interpolate % from vl.c to qemu-options.h, Paolo Bonzini, 2010/02/04
- [Qemu-devel] [PATCH 4/4] vl.c: avoid preprocessor directives in a printf call,
Paolo Bonzini <=