From patchwork Fri Feb 5 02:26:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 44604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C62A6B7BFA for ; Fri, 5 Feb 2010 13:30:31 +1100 (EST) Received: from localhost ([127.0.0.1]:55857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdDwe-00016C-2L for incoming@patchwork.ozlabs.org; Thu, 04 Feb 2010 21:29:20 -0500 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 ) 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 ) id 1NdDvG-0003Ko-60 for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:27:54 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 04 Feb 2010 18:27:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,409,1262592000"; d="scan'208";a="240704639" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop.localnet) ([10.239.36.165]) by azsmga001.ch.intel.com with ESMTP; 04 Feb 2010 18:27:42 -0800 From: Sheng Yang Organization: Intel Opensource Technology Center To: Paolo Bonzini Date: Fri, 5 Feb 2010 10:26:10 +0800 User-Agent: KMail/1.12.2 (Linux/2.6.31-17-generic; KDE/4.3.2; x86_64; ; ) 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 Message-Id: <201002051026.10614.sheng@linux.intel.com> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, quintela@redhat.com Subject: [Qemu-devel] Re: [PATCH 0/4] Fix printf calls embedding preprocessor directives X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }