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
This commit is contained in:
Jim Meyering 2009-01-05 14:07:31 +00:00
parent ea5775bf8e
commit 83dfc25c02
6 changed files with 39 additions and 16 deletions

View File

@ -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>

View File

@ -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

View File

@ -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)

View File

@ -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 */

18
src/libvirt_bridge.syms Normal file
View File

@ -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;

View File

@ -3,20 +3,6 @@
#
# bridge.h
brAddBridge;
brAddInterface;
brAddTap;
brDeleteBridge;
brInit;
brSetEnableSTP;
brSetForwardDelay;
brSetInetAddress;
brSetInetNetmask;
brSetInterfaceUp;
brShutdown;
# buf.h
virBufferVSprintf;
virBufferEscapeString;