From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Thu, 26 May 2011 21:30:21 +0000 (+0200)
Subject: Fix build with --with-driver-modules enabled
X-Git-Tag: CVE-2011-2178~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a07d178447b04332941b429f6ff2f51fceeb7721;p=thirdparty%2Flibvirt.git

Fix build with --with-driver-modules enabled

Export a bunch of missing symbols and link the remote driver to gnulib.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index c3d3102efe..02d53ee289 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -553,6 +553,7 @@ libvirt_driver_remote_la_CFLAGS =				\
 libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) $(SASL_LIBS)
 if WITH_DRIVER_MODULES
+libvirt_driver_remote_la_LIBADD += ../gnulib/lib/libgnu.la
 libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
 endif
 libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
@@ -1077,6 +1078,10 @@ if WITH_VMX
 USED_SYM_FILES += libvirt_vmx.syms
 endif
 
+if WITH_XENXS
+USED_SYM_FILES += libvirt_xenxs.syms
+endif
+
 EXTRA_DIST += \
   libvirt_public.syms		\
   libvirt_private.syms		\
@@ -1086,7 +1091,8 @@ EXTRA_DIST += \
   libvirt_macvtap.syms		\
   libvirt_daemon.syms		\
   libvirt_nwfilter.syms	\
-  libvirt_vmx.syms
+  libvirt_vmx.syms		\
+  libvirt_xenxs.syms
 
 BUILT_SOURCES += libvirt.syms libvirt.def libvirt_qemu.def
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7eea80d40f..2e2bd0a4a8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -932,6 +932,7 @@ virEventRemoveHandle;
 virExec;
 virExecWithHook;
 virFileAbsPath;
+virFileBuildPath;
 virFileDeletePid;
 virFileExists;
 virFileFindMountPoint;
@@ -1020,6 +1021,8 @@ virStrerror;
 
 
 # xml.h
+virXMLParseFileHelper;
+virXMLParseHelper;
 virXMLParseStrHelper;
 virXMLPropString;
 virXPathBoolean;
diff --git a/src/libvirt_xenxs.syms b/src/libvirt_xenxs.syms
new file mode 100644
index 0000000000..3d794d6c74
--- /dev/null
+++ b/src/libvirt_xenxs.syms
@@ -0,0 +1,21 @@
+#
+# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL.
+#
+
+# xen_sxpr.h
+xenFormatSxpr;
+xenFormatSxprChr;
+xenFormatSxprDisk;
+xenFormatSxprNet;
+xenFormatSxprOnePCI;
+xenFormatSxprSound;
+xenGetDomIdFromSxpr;
+xenGetDomIdFromSxprString;
+xenParseSxpr;
+xenParseSxprChar;
+xenParseSxprSound;
+xenParseSxprString;
+
+# xen_xm.h
+xenFormatXM;
+xenParseXM;