From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NdJcc-0008UH-D1 for qemu-devel@nongnu.org; Fri, 05 Feb 2010 03:33:02 -0500 Received: from [199.232.76.173] (port=60882 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdJcV-0008U0-O7 for qemu-devel@nongnu.org; Fri, 05 Feb 2010 03:32:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NdJcU-0007UE-Cp for qemu-devel@nongnu.org; Fri, 05 Feb 2010 03:32:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39234) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NdJcU-0007U8-0x for qemu-devel@nongnu.org; Fri, 05 Feb 2010 03:32:54 -0500 Message-ID: <4B6BD73D.8010208@redhat.com> Date: Fri, 05 Feb 2010 09:30:53 +0100 From: Kevin Wolf MIME-Version: 1.0 Subject: Re: [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives References: <201002042313.45353.sheng@linux.intel.com> <1265298599-4186-1-git-send-email-pbonzini@redhat.com> <201002051026.10614.sheng@linux.intel.com> In-Reply-To: <201002051026.10614.sheng@linux.intel.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sheng Yang Cc: Paolo Bonzini , aliguori@us.ibm.com, qemu-devel@nongnu.org, quintela@redhat.com Am 05.02.2010 03:26, schrieb Sheng Yang: > 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? These lines are only moved into another #ifdef (in qemu-options.hx), so this looks right to me. Kevin