OSDN Git Service

configure: CONFIG_NO_XEN is duplicated
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 17 Apr 2013 14:26:46 +0000 (16:26 +0200)
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>
Thu, 18 Apr 2013 12:12:31 +0000 (14:12 +0200)
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 <stefano.stabellini@eu.citrix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
configure
include/hw/xen/xen.h

index a71ba6f..1fef9ad 100755 (executable)
--- a/configure
+++ b/configure
@@ -4299,12 +4299,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)
index 6235f91..7451c5a 100644 (file)
@@ -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;