[libvirt] [PATCH 1/2] libxl: drop support for Xen < 4.6

[Jim Fehlig]

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.

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 docs/drvxen.html.in     | 11 +++++------
 m4/virt-driver-libxl.m4 | 23 ++---------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index d30ed2a04..935677387 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -56,12 +56,11 @@
         any other non-config files in this directory.
       </li>
       <li>
-        <strong>libxl</strong>: Starting with Xen 4.2, the legacy XenD/xm
-        toolstack is deprecated in favor of libxl, also commonly called
-        libxenlight.  libvirt supports this new Xen toolstack via the
-        libxl driver.  If XenD is enabled, the legacy xen driver consisting
-        of the above mentioned channels will be used.  If XenD is disabled,
-        the libxl driver will be used.
+        <strong>libxl</strong>: Starting with Xen 4.5, the legacy xm/xend
+        toolstack was removed and replaced with the new xl/libxl toolstack,
+        also commonly called libxenlight.  libvirt has supported this new
+        Xen toolstack since its introduction in Xen 4.2 and currently
+        supports Xen >= 4.6.
       </li>
     </ul>
 
diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4
index 2cc1c062d..48d2d7dfa 100644
--- a/m4/virt-driver-libxl.m4
+++ b/m4/virt-driver-libxl.m4
@@ -29,33 +29,14 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
   LIBXL_API_VERSION="-DLIBXL_API_VERSION=0x040400"
 
   dnl search for libxl, aka libxenlight
-  dnl Xen > 4.5 introduced a pkgconfig file, check for it first
+  dnl Xen 4.6 introduced a pkgconfig file
   old_with_libxl="$with_libxl"
-  LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.4.0], [true])
+  LIBVIRT_CHECK_PKG([LIBXL], [xenlight], [4.6.0])
   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
-    old_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $LIBXL_API_VERSION"
-    LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"])
-    CFLAGS="$old_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"
-- 
2.16.2