From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 17 Apr 2013 16:26:46 +0200 Message-Id: <1366208807-4433-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> References: <1366208807-4433-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/13] configure: CONFIG_NO_XEN is duplicated List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, edgar.iglesias@gmail.com 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; -- 1.8.1.4