From patchwork Fri Feb  5 02:26:10 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives
Date: Thu, 04 Feb 2010 16:26:10 -0000
From: Sheng Yang <sheng@linux.intel.com>
X-Patchwork-Id: 44604
Message-Id: <201002051026.10614.sheng@linux.intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, quintela@redhat.com

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:

Is it proper to remove #ifndef _WIN32 there?


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);
 }