External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Link security manager into libvirt.so

Browse Source 
Security manager is not a dynamically loadable driver, it's a common
infrastructure similar to util, conf, cpu, etc. used by individual
drivers. Such code is allowed to be linked into libvirt.so.

This reverts commit ec5b7bd2ecbf40ceff5b2d4fc00d5cfdfba966a4 and most of
aae5cfb69948fddef556f8f5b9f80a444f9c6125.

This patch is supposed to fix virdrivermoduletest failures for qemu and
lxc drivers as well as libvirtd's ability to load qemu and lxc drivers.
This commit is contained in:
Jiri Denemark 2012-08-02 14:10:31 +02:00
parent 7a054e99e2
commit 2f2ca02195
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/Makefile.am
View File

@ -164,7 +164,6 @@ endif
if WITH_NWFILTER if WITH_NWFILTER
libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
endif endif
libvirtd_LDADD += ../src/libvirt_driver_security.la
endif endif
libvirtd_LDADD += ../src/libvirt.la libvirtd_LDADD += ../src/libvirt.la

3
src/Makefile.am
View File

@ -1161,8 +1161,7 @@ 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
# Stateful, so linked to daemon instead libvirt_la_BUILT_LIBADD += libvirt_driver_security.la
#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)

31
src/libvirt_private.syms
View File

@ -961,6 +961,37 @@ 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

@ -295,8 +295,7 @@ 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
@ -521,7 +520,7 @@ virauthconfigtest_LDADD = $(LDADDS)
seclabeltest_SOURCES = \ seclabeltest_SOURCES = \
seclabeltest.c seclabeltest.c
seclabeltest_LDADD = $(LDADDS) ../src/libvirt_driver_security.la seclabeltest_LDADD = $(LDADDS)
virbuftest_SOURCES = \ virbuftest_SOURCES = \
virbuftest.c testutils.h testutils.c virbuftest.c testutils.h testutils.c