[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 11/11] configure: Improve Xen autodetection for ho
From: |
Stefan Weil |
Subject: |
[Qemu-trivial] [PATCH 11/11] configure: Improve Xen autodetection for hosts without Xen |
Date: |
Sat, 17 Dec 2011 09:27:39 +0100 |
With this patch, it only takes one test (instead of four)
to detect that there is no Xen support at all.
For most build hosts, this will reduce the time configure needs.
It will also reduce noisy output in config.log.
Build hosts with Xen now need up to five (instead of up to four)
tests. They get improved diagnostics when Xen support fails.
Cc: Stefano Stabellini <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
---
configure | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 1ae380f..b8ec19a 100755
--- a/configure
+++ b/configure
@@ -1317,10 +1317,30 @@ fi
if test "$xen" != "no" ; then
xen_libs="-lxenstore -lxenctrl -lxenguest"
- # Xen unstable
+ # First we test whether Xen headers and libraries are available.
+ # If no, we are done and there is no Xen support.
+ # If yes, more tests are run to detect the Xen version.
+
+ # Xen (any)
cat > $TMPC <<EOF
#include <xenctrl.h>
#include <xs.h>
+int main(void) {
+ return 0;
+}
+EOF
+ if ! compile_prog "" "$xen_libs" ; then
+ # Xen not found
+ if test "$xen" = "yes" ; then
+ feature_not_found "xen"
+ fi
+ xen=no
+
+ # Xen unstable
+ elif (
+ cat > $TMPC <<EOF
+#include <xenctrl.h>
+#include <xs.h>
#include <stdint.h>
#include <xen/hvm/hvm_info_table.h>
#if !defined(HVM_MAX_VCPUS)
@@ -1336,7 +1356,8 @@ int main(void) {
return 0;
}
EOF
- if compile_prog "" "$xen_libs" ; then
+ compile_prog "" "$xen_libs"
+ ) ; then
xen_ctrl_version=410
xen=yes
@@ -1407,10 +1428,10 @@ EOF
xen_ctrl_version=330
xen=yes
- # Xen not found or unsupported
+ # Xen version unsupported
else
if test "$xen" = "yes" ; then
- feature_not_found "xen"
+ feature_not_found "xen (unsupported version)"
fi
xen=no
fi
--
1.7.2.5
- Re: [Qemu-trivial] [Qemu-devel] [PATCH 03/11] configure: Fix compiler warning in config.log (integer from pointer), (continued)
[Qemu-trivial] [PATCH v2 03/11] configure: Fix compiler warning in config.log (integer from pointer), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 02/11] configure: Fix compiler warnings in config.log (old-style function definition), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 04/11] configure: Fix compiler warnings in config.log (null arguments), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 05/11] configure: Fix compiler warning in config.log (unused variable), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 09/11] configure: Fix compiler warning in config.log (value was never used), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 08/11] configure: Fix compiler warning in config.log (undefined NULL), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 11/11] configure: Improve Xen autodetection for hosts without Xen,
Stefan Weil <=
[Qemu-trivial] [PATCH 10/11] configure: Fix compiler warnings in config.log (statement without effect), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 07/11] configure: Fix compiler warnings in config.log (uninitialized variable), Stefan Weil, 2011/12/17
[Qemu-trivial] [PATCH 06/11] configure: Fix compiler warning in config.log (macro redefined), Stefan Weil, 2011/12/17
Re: [Qemu-trivial] [Qemu-devel] [PATCH 00/11] configure: Fix compiler warnings in config.log, Peter Maydell, 2011/12/17