[libvirt] [PATCH 61/89] m4/virt-libxl: properly check for required libxl version

[Jiri Denemark]

On Wed, Dec 21, 2016 at 14:14:25 +0100, Pavel Hrdina wrote:
> On Wed, Dec 21, 2016 at 10:52:17AM +0100, Jiri Denemark wrote:
> > On Fri, Dec 16, 2016 at 10:11:29 +0100, Pavel Hrdina wrote:
> > > Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> > > ---
> > >  m4/virt-driver-libxl.m4 | 18 ++++++++++++------
> > >  1 file changed, 12 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4
> > > index 2fdeaa506e..498cad3240 100644
> > > --- a/m4/virt-driver-libxl.m4
> > > +++ b/m4/virt-driver-libxl.m4
> > > @@ -28,6 +28,7 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
> > >    LIBXL_CFLAGS=""
> > >    LIBXL_FIRMWARE_DIR=""
> > >    LIBXL_EXECBIN_DIR=""
> > > +  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
> > > @@ -41,17 +42,22 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [
> > >    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
> > > +    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.2 to compile libxenlight driver with -lxl])
> > > +      AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile libxenlight driver with -lxl])
> > 
> > I see. We actually do not support libxenlight 4.2. I guess the 4.4.0
> > requirement in the previous patch should be changed to 4.2.0 and fixed
> > to 4.4.0 in this patch.
> 
> I'll do it like that.  Again this is due to splitting the fix into multiple
> patches.

ACK to both with this fix then.

Jirka