From b0119de82fbbfbf1a31647f5029d1e901251b30a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 5 Jan 2009 14:08:26 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ configure.in | 2 ++ src/Makefile.am | 4 ++++ src/libvirt_linux.syms | 8 ++++++++ src/libvirt_private.syms | 5 ----- 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/libvirt_linux.syms diff --git a/ChangeLog b/ChangeLog index 2c7d626546..fcef111362 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,12 @@ Mon Jan 5 2009 14:53:48 CET John Levon * 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 diff --git a/configure.in b/configure.in index 96f288ead4..c333cc437f 100644 --- 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 ccc6b5fcd7..1f707e258d 100644 --- 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 index 0000000000..018c8928da --- /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 d5451c379e..14c59449d8 100644 --- 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;