[libvirt] [PATCH 5/8] Add domainXMLFromNative/domainXMLToNative to libxl driver

[Daniel P. Berrange]

On Thu, Mar 24, 2011 at 08:23:06AM -0600, Jim Fehlig wrote:
> Markus Groß wrote:
> > ---
> >  configure.ac             |    2 +
> >  daemon/Makefile.am       |    3 +
> >  src/Makefile.am          |    8 ++-
> >  src/libxl/libxl_driver.c |   94 +++++++++++++++++++++++++++++++++++++++++++++-
> >  4 files changed, 102 insertions(+), 5 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index 12bf0f6..3519011 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -607,6 +607,8 @@ AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"])
> >  AC_SUBST([XEN_CFLAGS])
> >  AC_SUBST([XEN_LIBS])
> >  
> > +AM_CONDITIONAL([WITH_XENXS], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
> > +
> >  dnl
> >  dnl check for kernel headers required by xen_inotify
> >  dnl
> > diff --git a/daemon/Makefile.am b/daemon/Makefile.am
> > index 9e3a557..4344127 100644
> > --- a/daemon/Makefile.am
> > +++ b/daemon/Makefile.am
> > @@ -108,6 +108,9 @@ endif
> >  
> >  if WITH_LIBXL
> >      libvirtd_LDADD += ../src/libvirt_driver_libxl.la
> > +    libvirtd_LDADD += ../src/libvirt_xenxs.la
> > +    libvirtd_LDADD += ../src/libvirt_util.la
> > +    libvirtd_LDADD += ../src/libvirt_conf.la
> >  endif
> >   
> 
> I'd like to get another opinion on this hunk.  Although I cant find any
> issues with it, I'd just like to ensure there is not a more appropriate
> way to add these libs.

libvirtd is linked against libvirt.so, so it is already able to
get access to any symbols in libvirt_util.la or libvirt_conf.la,
*provided* the symbols are listed in libvirt_private.syms.

I'm guessing there were one or two not listed in the private
exports file, making it appear that these extra linker lines
were needed. Just add the extra symbols to that file and you
should be fine

Finally libvirt_driver_libxl.la's own LDADD line should have the
libvirt_xenxs.la reference, rather than libvirtd.


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|