The secret driver is stateful, link it directly to libvirtd

All other stateful drivers are linked directly to libvirtd
instead of libvirt.so. Link the secret driver to libvirtd too.

* daemon/Makefile.am: link the secret driver to libvirtd
* daemon/libvirtd.c: add #ifdef WITH_SECRETS blocks
* src/Makefile.am: don't link the secret driver to libvirt.so
* src/libvirt_private.syms: remove the secretRegister symbol
This commit is contained in:
Matthias Bolte 2009-12-22 14:50:50 +01:00
parent f7e5ca90e6
commit a26d2628c0
4 changed files with 10 additions and 3 deletions

View File

@ -110,6 +110,10 @@ endif
if WITH_NODE_DEVICES
libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
endif
if WITH_SECRETS
libvirtd_LDADD += ../src/libvirt_driver_secret.la
endif
endif
libvirtd_LDADD += ../src/libvirt.la

View File

@ -93,8 +93,10 @@
#ifdef WITH_NODE_DEVICES
#include "node_device/node_device_driver.h"
#endif
#ifdef WITH_SECRETS
#include "secret/secret_driver.h"
#endif
#endif
#ifdef __sun
@ -880,7 +882,9 @@ static struct qemud_server *qemudInitialize(void) {
#if defined(WITH_NODE_DEVICES)
nodedevRegister();
#endif
#ifdef WITH_SECRETS
secretRegister();
#endif
#ifdef WITH_QEMU
qemuRegister();
#endif

View File

@ -598,7 +598,8 @@ if WITH_DRIVER_MODULES
mod_LTLIBRARIES += libvirt_driver_secret.la
else
noinst_LTLIBRARIES += libvirt_driver_secret.la
libvirt_la_LIBADD += libvirt_driver_secret.la
# Stateful, so linked to daemon instead
#libvirt_la_LIBADD += libvirt_driver_secret.la
endif
libvirt_driver_secret_la_CFLAGS = \
-I@top_srcdir@/src/conf

View File

@ -453,8 +453,6 @@ virSecretDefParseString;
virSecretDefParseFile;
virSecretDefFormat;
# secret_driver.h
secretRegister;
# security.h
virSecurityDriverVerify;