[libvirt] [PATCH] Link xen driver against libxl

[Guido Günther]

On Tue, Apr 05, 2016 at 01:16:27PM +0200, Jiri Denemark wrote:
> On Thu, Mar 31, 2016 at 17:01:49 +0200, Guido Günther wrote:
> > to avoid the test failure
> > 
> >  7) Test driver "xen"  ... 2016-03-31 12:53:26.950+0000: 22430: debug : virDriverLoadModule:54 : Module load xen
> >  2016-03-31 12:53:26.950+0000: 22430: error : virDriverLoadModule:73 : failed to load module /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so: undefined symbol: xlu_cfg_destroy
> > FAILED
> > ---
> > 
> > I have not yet investigated how this change came about so this is more
> > of a RFC.
> > 
> >  src/Makefile.am | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index 1726d06..5f37607 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -1218,7 +1218,9 @@ libvirt_driver_xen_impl_la_CFLAGS =				\
> >  		-I$(srcdir)/xenconfig				\
> >  		$(AM_CFLAGS)
> >  libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
> > -libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la
> > +libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) \
> > +		$(LIBXL_LIBS) \
> > +		libvirt_xenconfig.la
> >  libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
> >  endif WITH_XEN
> 
> The xlu_cfg_destroy symbol usage comes from libvirt_xenconfig.la, which
> is built from XENCONFIG_SOURCES, which contains xenconfig/xen_xl.[ch] if
> WITH_LIBXL is set. In other words, libvirt_xenconfig.la should be fixed
> to bring $(LIBXL_LIBS) if required.
> 
> I'd suggest something like
> 
> if WITH_LIBXL
> libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS)
> endif
> 
> should be inserted where libvirt_xenconfig_la_CFLAGS is set.
> 
> Untested, though.

And we even hadd a LIBADD there but for libvirt not libvirt_xenconfig,
so what about:

>From 4e302ea482d58c5ae034f85ea27d0318cb0b59c5 Mon Sep 17 00:00:00 2001
Message-Id: <4e302ea482d58c5ae034f85ea27d0318cb0b59c5.1459872920.git.agx at sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
Date: Thu, 31 Mar 2016 14:57:24 +0200
Subject: [PATCH] Link libvirt_xenconfig instead of libvirt against libxl
To: libvir-list at redhat.com
Status: O
Content-Length: 975
Lines: 24

to avoid the test failure

 7) Test driver "xen"  ... 2016-03-31 12:53:26.950+0000: 22430: debug : virDriverLoadModule:54 : Module load xen
 2016-03-31 12:53:26.950+0000: 22430: error : virDriverLoadModule:73 : failed to load module /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so: undefined symbol: xlu_cfg_destroy
FAILED
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1726d06..e63b81d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1134,7 +1134,7 @@ endif WITH_VMX
 if WITH_XENCONFIG
 noinst_LTLIBRARIES += libvirt_xenconfig.la
 libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
-libvirt_la_LIBADD += $(LIBXL_LIBS)
+libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS)
 libvirt_xenconfig_la_CFLAGS = \
 		-I$(srcdir)/conf $(AM_CFLAGS)
 libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
-- 
2.8.0.rc3