Move bridge symbols into a separate syms file

* configure.in: Provide a new --with-bridge option.
* src/Makefile.am (PRIVSYMFILES) [WITH_BRIDGE]: Append libvirt_bridge.syms.
* 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.
Author: John Levon

diff --git a/ChangeLog b/ChangeLog
index 9d7ac01334d3f16588a54450878f3f99bd237b77..2c7d626546ff239b79d39923aaa37546bd2dce35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,14 @@ Mon Jan  5 2009 14:53:48 CET John Levon <john.levon@sun.com>
        * src/Makefile.am (PRIVSYMFILES): Append libvirt_driver_modules.syms.
        * src/libvirt_private.syms: Move virDriverLoadModule into...
        * src/libvirt_driver_modules.syms: ... this new file.
+
+       Move bridge symbols into a separate syms file
+       * configure.in: Provide a new --with-bridge option.
+       * src/Makefile.am (PRIVSYMFILES) [WITH_BRIDGE]: Append
+       libvirt_bridge.syms.
+       * 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.
        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 3358cffa5dd14a99aa2aae5fad5723a3418a86c8..96f288ead4abe52eeb186d41daf67ec828b43541 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -275,6 +275,13 @@ if test "$with_qemu" = "yes" ; then
 fi
 AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"])
 
+with_bridge=no
+if test "$with_qemu" = "yes" -o "$with_lxc" = "yes"; then
+    with_bridge=yes
+    AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed])
+fi
+AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
+
 if test "$with_uml" = "yes" ; then
     AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled])
 fi

diff --git a/src/Makefile.am b/src/Makefile.am
index 29b4df66eace7ffe41372dfc851793cc82017cd1..ccc6b5fcd73e25f1952cf1c406f0cb0de979d043 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -419,6 +419,10 @@ if WITH_DRIVER_MODULES
 PRIVSYMFILES += libvirt_driver_modules.syms
 endif
 
+if WITH_BRIDGE
+PRIVSYMFILES += libvirt_bridge.syms
+endif
+
 EXTRA_DIST += libvirt_public.syms $(PRIVSYMFILES)
 
 libvirt.syms: libvirt_public.syms $(PRIVSYMFILES)

diff --git a/src/bridge.c b/src/bridge.c
index 13d81bcafe6e691bea1fd1f7758737479cc55b69..38e0b465a907a6aa7fa06c58a22fff675b5686a0 100644 (file)
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#if defined(WITH_QEMU) || defined(WITH_LXC)
+#if defined(WITH_BRIDGE)
 
 #include "bridge.h"
 
@@ -750,4 +750,4 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED,
     return 0;
 }
 
-#endif /* WITH_QEMU || WITH_LXC */
+#endif /* WITH_BRIDGE */

diff --git a/src/libvirt_bridge.syms b/src/libvirt_bridge.syms
new file mode 100644 (file)
index 0000000..f898f42
--- /dev/null
+++ b/src/libvirt_bridge.syms
@@ -0,0 +1,18 @@
+#
+# These symbols are dependent upon --with-qemu or --with-lxc via
+# WITH_BRIDGE.
+#
+
+
+# bridge.h
+brAddBridge;
+brAddInterface;
+brAddTap;
+brDeleteBridge;
+brInit;
+brSetEnableSTP;
+brSetForwardDelay;
+brSetInetAddress;
+brSetInetNetmask;
+brSetInterfaceUp;
+brShutdown;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6f3cd672f63f76799db8991b22f4323a98145d75..d5451c379e1141da57d3bac2ca4d562c7fec5ac9 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3,20 +3,6 @@
 #
 
 
-# bridge.h
-brAddBridge;
-brAddInterface;
-brAddTap;
-brDeleteBridge;
-brInit;
-brSetEnableSTP;
-brSetForwardDelay;
-brSetInetAddress;
-brSetInetNetmask;
-brSetInterfaceUp;
-brShutdown;
-
-
 # buf.h
 virBufferVSprintf;
 virBufferEscapeString;