External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Don't link nwfilter or secrets driver to libvirt.so

Browse Source 
The nwfilter and secrets drivers are both stateful and are already
linked directly to libvirtd. Linking them to libvirt.so is thus
wrong, likewise exporting their symbols in libvirt.so is wrong
This commit is contained in:
Daniel P. Berrange 2012-07-31 10:57:10 +01:00
parent 5830c72e15
commit aae5cfb699
4 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile.am
View File

@ -1165,8 +1165,9 @@ if WITH_NWFILTER
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
mod_LTLIBRARIES += libvirt_driver_nwfilter.la mod_LTLIBRARIES += libvirt_driver_nwfilter.la
else else
libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
noinst_LTLIBRARIES += libvirt_driver_nwfilter.la noinst_LTLIBRARIES += libvirt_driver_nwfilter.la
# Stateful, so linked to daemon instead
#libvirt_la_BUILT_LIBADD += libvirt_driver_nwfilter.la
endif endif
libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \ libvirt_driver_nwfilter_la_CFLAGS = $(LIBPCAP_CFLAGS) \
-I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS) -I$(top_srcdir)/src/conf $(LIBNL_CFLAGS) $(AM_CFLAGS)
@ -1182,7 +1183,8 @@ endif
libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES) libvirt_driver_security_la_SOURCES = $(SECURITY_DRIVER_SOURCES)
noinst_LTLIBRARIES += libvirt_driver_security.la noinst_LTLIBRARIES += libvirt_driver_security.la
libvirt_la_BUILT_LIBADD += libvirt_driver_security.la # Stateful, so linked to daemon instead
#libvirt_la_BUILT_LIBADD += libvirt_driver_security.la
libvirt_driver_security_la_CFLAGS = \ libvirt_driver_security_la_CFLAGS = \
-I$(top_srcdir)/src/conf $(AM_CFLAGS) -I$(top_srcdir)/src/conf $(AM_CFLAGS)
libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_security_la_LDFLAGS = $(AM_LDFLAGS)
@ -1320,10 +1322,6 @@ if WITH_LIBVIRTD
USED_SYM_FILES += libvirt_daemon.syms USED_SYM_FILES += libvirt_daemon.syms
endif endif
if WITH_NWFILTER
USED_SYM_FILES += libvirt_nwfilter.syms
endif
if WITH_OPENVZ if WITH_OPENVZ
USED_SYM_FILES += libvirt_openvz.syms USED_SYM_FILES += libvirt_openvz.syms
endif endif
@ -1347,7 +1345,6 @@ EXTRA_DIST += \
libvirt_daemon.syms \ libvirt_daemon.syms \
libvirt_linux.syms \ libvirt_linux.syms \
libvirt_esx.syms \ libvirt_esx.syms \
libvirt_nwfilter.syms \
libvirt_openvz.syms \ libvirt_openvz.syms \
libvirt_qemu.syms \ libvirt_qemu.syms \
libvirt_sasl.syms \ libvirt_sasl.syms \

12
src/libvirt_nwfilter.syms
View File

@ -1,12 +0,0 @@
#
# These symbols are dependent on WITH_NWFILTER.
#
# nwfilter_gentech_driver.h
virNWFilterInstantiateFilter;
virNWFilterTeardownFilter;
# nwfilter_learnipaddr.h
virNWFilterLookupLearnReq;

31
src/libvirt_private.syms
View File

@ -962,37 +962,6 @@ virSecretUsageTypeTypeFromString;
virSecretUsageTypeTypeToString; virSecretUsageTypeTypeToString;
# security_driver.h
virSecurityDriverLookup;
# security_manager.h
virSecurityManagerClearSocketLabel;
virSecurityManagerFree;
virSecurityManagerGenLabel;
virSecurityManagerGetDOI;
virSecurityManagerGetModel;
virSecurityManagerGetProcessLabel;
virSecurityManagerNew;
virSecurityManagerNewStack;
virSecurityManagerNewDAC;
virSecurityManagerReleaseLabel;
virSecurityManagerReserveLabel;
virSecurityManagerRestoreImageLabel;
virSecurityManagerRestoreAllLabel;
virSecurityManagerRestoreHostdevLabel;
virSecurityManagerRestoreSavedStateLabel;
virSecurityManagerSetAllLabel;
virSecurityManagerSetDaemonSocketLabel;
virSecurityManagerSetImageFDLabel;
virSecurityManagerSetImageLabel;
virSecurityManagerSetHostdevLabel;
virSecurityManagerSetProcessLabel;
virSecurityManagerSetSavedStateLabel;
virSecurityManagerSetSocketLabel;
virSecurityManagerVerify;
virSecurityManagerGetMountOptions;
# sexpr.h # sexpr.h
sexpr_append; sexpr_append;
sexpr_cons; sexpr_cons;

5
tests/Makefile.am
View File

@ -294,7 +294,8 @@ endif
if WITH_QEMU if WITH_QEMU
qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la \
../src/libvirt_driver_security.la
if WITH_NETWORK if WITH_NETWORK
qemu_LDADDS += ../src/libvirt_driver_network_impl.la qemu_LDADDS += ../src/libvirt_driver_network_impl.la
endif endif
@ -519,7 +520,7 @@ virauthconfigtest_LDADD = $(LDADDS)
seclabeltest_SOURCES = \ seclabeltest_SOURCES = \
seclabeltest.c seclabeltest.c
seclabeltest_LDADD = $(LDADDS) seclabeltest_LDADD = $(LDADDS) ../src/libvirt_driver_security.la
virbuftest_SOURCES = \ virbuftest_SOURCES = \
virbuftest.c testutils.h testutils.c virbuftest.c testutils.h testutils.c