From patchwork Wed Apr 17 14:26:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 237245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5E3E62C0148 for ; Thu, 18 Apr 2013 00:32:55 +1000 (EST) Received: from localhost ([::1]:46718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTPp-0006Yr-Jd for incoming@patchwork.ozlabs.org; Wed, 17 Apr 2013 10:32:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKa-0006Iv-75 for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USTKY-0005ee-Q6 for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:28 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:43081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USTKY-0005eZ-J4 for qemu-devel@nongnu.org; Wed, 17 Apr 2013 10:27:26 -0400 Received: by mail-ee0-f50.google.com with SMTP id e53so805159eek.9 for ; Wed, 17 Apr 2013 07:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ZpxG2BksEo9wzlTx1FURv0eCBTMtk61RKxrcrI9aGvk=; b=RYw6MDmrchQ0HUZM0okqDqTJMEk0rhpdD364lEIaKAc5PXDFGGexuSoejNadT4ApJj Y+IEOuv3fYc1LTZtVwYCuLMMI+GwmduSMy9GaQ1L0qNfojiS80D5UXt85f7tD1oswgpI OZEvLzjV5bamfOAumhfTe7Udw7l0Yp4gQB/MdHQAQRXl5ujDrD3r7EIZB0TOoRkSmlTr 8fpDGRH8dZu4NLRImVo3jxVbpRKb1crD/NS1hBfFzSpSKAis1bbDopZQ7iJ9fKK4cSG1 3vkcbE4V16RIYxpg2U0vWef1Pa3S/v44sIIFEqHYfMfZl2l88QKg6PafYxStOuAkaZNR chqw== X-Received: by 10.15.32.142 with SMTP id a14mr18939090eev.22.1366208845790; Wed, 17 Apr 2013 07:27:25 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id w51sm9373448eev.13.2013.04.17.07.27.23 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 07:27:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 17 Apr 2013 16:26:46 +0200 Message-Id: <1366208807-4433-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> References: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.50 Cc: peter.maydell@linaro.org, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH 12/13] configure: CONFIG_NO_XEN is duplicated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We already define it in Makefile.target. But we need to avoid a curious double negation in order to eliminate it. Tested-by: Stefano Stabellini Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 3 --- include/hw/xen/xen.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index 6e775aa..78afded 100755 --- a/configure +++ b/configure @@ -4277,12 +4277,9 @@ case "$target_arch2" in if test "$xen_pci_passthrough" = yes; then echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak" fi - else - echo "CONFIG_NO_XEN=y" >> $config_target_mak fi ;; *) - echo "CONFIG_NO_XEN=y" >> $config_target_mak esac case "$target_arch2" in arm|i386|x86_64|ppcemb|ppc|ppc64|s390x) diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 6235f91..7451c5a 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -25,7 +25,7 @@ extern bool xen_allowed; static inline bool xen_enabled(void) { -#if defined(CONFIG_XEN_BACKEND) && !defined(CONFIG_NO_XEN) +#if defined(CONFIG_XEN_BACKEND) && defined(CONFIG_XEN) return xen_allowed; #else return 0;