On Thursday 04 February 2010 23:49:55 Paolo Bonzini wrote:
> Patch 1 is the same I sent earlier. Patches 2 and 3/4 fix the
> other two problems by Sheng (tip: next time use "make -k" and
> report all problems in a single message).
>
> Paolo Bonzini (4):
> qemu-img: avoid preprocessor directives in a printf call
> cope with printf macro definition in readline.c
> do not interpolate % from vl.c to qemu-options.h
> vl.c: avoid preprocessor directives in a printf call
>
> qemu-img.c | 9 +++++----
> qemu-options.hx | 15 ++++++++-------
> readline.c | 1 +
> vl.c | 23 +++++++++--------------
> 4 files changed, 23 insertions(+), 25 deletions(-)
>
Works fine with me. Thanks. :)
But:
diff --git a/vl.c b/vl.c
index 39833fc..3d2de7b 100644
--- a/vl.c
+++ b/vl.c
@@ -4041,14 +4041,7 @@ static void help(int exitcode)
"\n"
"When using -nographic, press 'ctrl-a h' to get some help.\n"
,
- "qemu",
- DEFAULT_RAM_SIZE,
-#ifndef _WIN32
- DEFAULT_NETWORK_SCRIPT,
- DEFAULT_NETWORK_DOWN_SCRIPT,
-#endif
- DEFAULT_GDBSTUB_PORT,
- "/tmp/qemu.log");
+ "qemu");
exit(exitcode);
}
Is it proper to remove #ifndef _WIN32 there?
--
regards
Yang, Sheng
