From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NdDvJ-000131-TO
	for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:27:57 -0500
Received: from [199.232.76.173] (port=50459 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NdDvJ-00012n-4C
	for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:27:57 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <sheng@linux.intel.com>) id 1NdDvG-0003Lv-Jj
	for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:27:56 -0500
Received: from mga07.intel.com ([143.182.124.22]:24148
	helo=azsmga101.ch.intel.com)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <sheng@linux.intel.com>) id 1NdDvG-0003Ko-60
	for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:27:54 -0500
From: Sheng Yang <sheng@linux.intel.com>
Date: Fri, 5 Feb 2010 10:26:10 +0800
References: <201002042313.45353.sheng@linux.intel.com>
	<1265298599-4186-1-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1265298599-4186-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Message-Id: <201002051026.10614.sheng@linux.intel.com>
Subject: [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding
	preprocessor directives
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
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:

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