migrate linux-specific symbol names into their own sym file

* configure.in (WITH_LINUX): New automake conditional.
* src/Makefile.am (PRIVSYMFILES) [WITH_LINUX]: Append libvirt_linux.syms.
* src/libvirt_private.syms: Move two symbol names into...
* src/libvirt_linux.syms: ...this new file.
Author: John Levon

diff --git a/ChangeLog b/ChangeLog
index 2c7d626546ff239b79d39923aaa37546bd2dce35..fcef111362a624ffa5dfc5358eabc7adfd952caa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,12 @@ Mon Jan  5 2009 14:53:48 CET John Levon <john.levon@sun.com>
        * src/bridge.c: Test WITH_BRIDGE rather than particular drivers.
        * src/libvirt_private.syms: Move bridge-related symbols into...
        * src/libvirt_bridge.syms: ...this new file.
+
+       migrate linux-specific symbol names into their own sym file
+       * configure.in (WITH_LINUX): New automake conditional.
+       * src/Makefile.am (PRIVSYMFILES) [WITH_LINUX]: Append libvirt_linux.syms.
+       * src/libvirt_private.syms: Move two symbol names into...
+       * src/libvirt_linux.syms: ...this new file.
        Author: John Levon
 
 Mon Jan  5 14:22:06 CET 2009 Jim Meyering <meyering@redhat.com>

diff --git a/configure.in b/configure.in
index 96f288ead4abe52eeb186d41daf67ec828b43541..c333cc437ff505a22f352d69054bb34fd5213439 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1248,6 +1248,8 @@ then
 fi
 AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"])
 
+AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"])
+
 # Only COPYING.LIB is under version control, yet COPYING
 # is included as part of the distribution tarball.
 # Copy one to the other, but only if this is a srcdir-build.

diff --git a/src/Makefile.am b/src/Makefile.am
index ccc6b5fcd73e25f1952cf1c406f0cb0de979d043..1f707e258d9ada7778494a28fbccee261d08d9f1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -423,6 +423,10 @@ if WITH_BRIDGE
 PRIVSYMFILES += libvirt_bridge.syms
 endif
 
+if WITH_LINUX
+PRIVSYMFILES += libvirt_linux.syms
+endif
+
 EXTRA_DIST += libvirt_public.syms $(PRIVSYMFILES)
 
 libvirt.syms: libvirt_public.syms $(PRIVSYMFILES)

diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
new file mode 100644 (file)
index 0000000..018c892
--- /dev/null
+++ b/src/libvirt_linux.syms
@@ -0,0 +1,8 @@
+#
+# Linux-specific private symbols.
+#
+
+
+# stats_linux.h
+linuxDomainInterfaceStats;
+xenLinuxDomainBlockStats;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d5451c379e1141da57d3bac2ca4d562c7fec5ac9..14c59449d86c1e7ff3a3d0939e38cd9920778be8 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -231,11 +231,6 @@ qparam_query_parse;
 free_qparam_set;
 
 
-# stats_linux.h
-linuxDomainInterfaceStats;
-xenLinuxDomainBlockStats;
-
-
 # storage_backend.h
 virStorageBackendForType;
 virStorageBackendRunProgNul;