summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-17 16:26:46 +0200
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2013-04-18 14:12:31 +0200
commit15c08efebde85a564b68285a4b6999f673ce422f (patch)
tree7cc0600c227f4a9cc68bdbc9946149ee2e386d57
parent2b6b7099fb17ab9efa51c430e348ee88d6fbcef2 (diff)
downloadqemu-15c08efebde85a564b68285a4b6999f673ce422f.tar.gz
qemu-15c08efebde85a564b68285a4b6999f673ce422f.tar.bz2
qemu-15c08efebde85a564b68285a4b6999f673ce422f.zip
configure: CONFIG_NO_XEN is duplicated
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>
-rwxr-xr-xconfigure3
-rw-r--r--include/hw/xen/xen.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index a71ba6f510..1fef9ad4f4 100755
--- 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)
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 6235f91fe0..7451c5a0bf 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;