From 83dfc25c02a698f61e09dab7f77bd8c7ad5a681e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 5 Jan 2009 14:07:31 +0000
Subject: [PATCH] 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
---
 ChangeLog                |  8 ++++++++
 configure.in             |  7 +++++++
 src/Makefile.am          |  4 ++++
 src/bridge.c             |  4 ++--
 src/libvirt_bridge.syms  | 18 ++++++++++++++++++
 src/libvirt_private.syms | 14 --------------
 6 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 src/libvirt_bridge.syms

diff --git a/ChangeLog b/ChangeLog
index 9d7ac01334..2c7d626546 100644
--- 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 3358cffa5d..96f288ead4 100644
--- 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 29b4df66ea..ccc6b5fcd7 100644
--- 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 13d81bcafe..38e0b465a9 100644
--- 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
index 0000000000..f898f425c6
--- /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 6f3cd672f6..d5451c379e 100644
--- 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;