From patchwork Tue Apr 2 14:44:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233022 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 D0B4A2C013A for ; Wed, 3 Apr 2013 01:46:58 +1100 (EST) Received: from localhost ([::1]:41085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2UD-0007kT-31 for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 10:46:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2Rz-0004jZ-14 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2Rv-0002nV-NC for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:44:38 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:35543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2Rv-0002nP-Fg for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:44:35 -0400 Received: by mail-ee0-f48.google.com with SMTP id b15so274234eek.35 for ; Tue, 02 Apr 2013 07:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=SJ7vNLwIpAEtxqbjvA22JprddIFLHs0FDjb17rx6BFQ=; b=EMVKs7pnlLtN/HsgDzq8Bsdn7EkUlsAfwXxcQW5yrirbIqb2B7+d3Gydb5IzX0Ulvs 2Q2DUaObvjDC/ogmCGfJnpTegVqjc0GFnkhoj2ou8Qt2JvQjgQjjI6weaISMHEpK/3ug 67M1i1jBnBPxRe68PJ06kJkRXrPPHho7KRAFMdntX6XCwHHwO26uESktQArAzUZETUlC jktTvcNLV0N7rPBVYaEK6XGHVm+Pr42ex4HMztUQVXY/Jmpo+1Qjd4kJ0/JFe6Hi0cJU zlGQczXYQKrwMMVKFzlnd4PKmOBasw6OBgv5mZk73OCGS3shQUz38097GoYww1/Q8hLl 7m0w== X-Received: by 10.14.1.130 with SMTP id 2mr49629692eed.15.1364913874757; Tue, 02 Apr 2013 07:44:34 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id a1sm3143103eep.2.2013.04.02.07.44.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 07:44:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:44:20 +0200 Message-Id: <1364913860-25159-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364913860-25159-1-git-send-email-pbonzini@redhat.com> References: <1364913860-25159-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.48 Subject: [Qemu-devel] [PATCH 5/5] 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. Signed-off-by: Paolo Bonzini Tested-by: Stefano Stabellini Reviewed-by: Peter Maydell --- configure | 3 --- hw/xen.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index da0e8aa..98716ae 100755 --- a/configure +++ b/configure @@ -4161,12 +4161,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/hw/xen.h b/hw/xen.h index 6235f91..7451c5a 100644 --- a/hw/xen.h +++ b/hw/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;