On 09/11/2018 01:13 AM, Jim Fehlig wrote:
Currently the libxl driver claims support for Xen >= 4.4, but
Xen 4.4 and 4.5 are no longer supported upstream. Let's increase
the minimum supported version to 4.6.
Since Xen 4.6 contains a pkgconfig file, drop the now unused code
that falls back to using LIBVIRT_CHECK_LIB in the absence of
pkgconfig file.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
docs/drvxen.html.in | 2 +-
m4/virt-driver-libxl.m4 | 22 +---------------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index 2e45e09527..ff67291ec6 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -8,7 +8,7 @@
<p>
The libvirt libxl driver provides the ability to manage virtual
- machines on any Xen release from 4.4.0 onwards.
+ machines on any Xen release from 4.6.0 onwards.
</p>
<h2><a id="project">Project Links</a></h2>
diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4
index 90338eb306..fa51afd2f8 100644
--- a/m4/virt-driver-libxl.m4
+++ b/m4/virt-driver-libxl.m4
@@ -29,33 +29,13 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
LIBXL_API_VERSION="-DLIBXL_API_VERSION=0x040400"
Should this be changed to 4.6 then? Looking into libxl.h only
4.{2,3,4,5} are supported. However, looking further into the header file
I can see checks like this:
#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040800
dnl search for libxl, aka libxenlight
- dnl Xen > 4.5 introduced a pkgconfig file, check for it first
old_with_libxl="$with_libxl"
This ^^^ is now unused variable since you're removing it below.
- LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.4.0], [true])
+ LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.6.0], [true])
if test "x$with_libxl" = "xyes" ; then
LIBXL_FIRMWARE_DIR=$($PKG_CONFIG --variable xenfirmwaredir xenlight)
LIBXL_EXECBIN_DIR=$($PKG_CONFIG --variable libexec_bin xenlight)
fi
- dnl pkgconfig file not found, fallback to lib probe
- if test "x$with_libxl" = "xno" ; then
- with_libxl="$old_with_libxl"
-
- dnl LIBXL_API_VERSION 4.4.0 introduced a new parameter to
- dnl libxl_domain_create_restore for specifying restore parameters.
- dnl The libxl driver will make use of this new parameter for specifying
- dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger
- dnl an error if there is too old xenlight
- libxlold_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $LIBXL_API_VERSION"
- LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h],
[fail="1"])
- CFLAGS="$libxlold_CFLAGS"
-
- if test $fail = 1; then
- AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile
libxenlight driver with -lxl])
- fi
- fi
-
if test "$with_libxl" = "yes"; then
old_LIBS="$LIBS"
old_CFLAGS="$CFLAGS"
ACK
Michal