External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: conditionalize driver loading in libvirtd daemon

Browse Source 
Prepare for reusing libvirtd source to create other daemons by making
the driver(s) to load conditionally defined by the make rules.

If nothing is set, all drivers will be loaded, ignoring any missing ones
as historically done.

If MODULE_NAME is set only one driver will be loaded and that one must
succeed.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-06-21 17:19:11 +01:00
parent 74d76d6478
commit 5d3475c8dc
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/remote/remote_daemon.c
View File

@ -311,60 +311,67 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority)
static int daemonInitialize(void)
{
/*
#ifdef MODULE_NAME
/* This a dedicated per-driver daemon build */
if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
return -1;
#else
/* This is the legacy monolithic libvirtd built with all drivers
*
* Note that the order is important: the first ones have a higher
* priority when calling virStateInitialize. We must register the
* network, storage and nodedev drivers before any stateful domain
* driver, since their resources must be auto-started before any
* domains can be auto-started.
*/
#ifdef WITH_NETWORK
# ifdef WITH_NETWORK
if (virDriverLoadModule("network", "networkRegister", false) < 0)
return -1;
#endif
#ifdef WITH_INTERFACE
# endif
# ifdef WITH_INTERFACE
if (virDriverLoadModule("interface", "interfaceRegister", false) < 0)
return -1;
#endif
#ifdef WITH_SECRETS
# endif
# ifdef WITH_SECRETS
if (virDriverLoadModule("secret", "secretRegister", false) < 0)
return -1;
#endif
#ifdef WITH_STORAGE
# endif
# ifdef WITH_STORAGE
if (virDriverLoadModule("storage", "storageRegister", false) < 0)
return -1;
#endif
#ifdef WITH_NODE_DEVICES
# endif
# ifdef WITH_NODE_DEVICES
if (virDriverLoadModule("nodedev", "nodedevRegister", false) < 0)
return -1;
#endif
#ifdef WITH_NWFILTER
# endif
# ifdef WITH_NWFILTER
if (virDriverLoadModule("nwfilter", "nwfilterRegister", false) < 0)
return -1;
#endif
#ifdef WITH_LIBXL
# endif
# ifdef WITH_LIBXL
if (virDriverLoadModule("libxl", "libxlRegister", false) < 0)
return -1;
#endif
#ifdef WITH_QEMU
# endif
# ifdef WITH_QEMU
if (virDriverLoadModule("qemu", "qemuRegister", false) < 0)
return -1;
#endif
#ifdef WITH_LXC
# endif
# ifdef WITH_LXC
if (virDriverLoadModule("lxc", "lxcRegister", false) < 0)
return -1;
#endif
#ifdef WITH_VBOX
# endif
# ifdef WITH_VBOX
if (virDriverLoadModule("vbox", "vboxRegister", false) < 0)
return -1;
#endif
#ifdef WITH_BHYVE
# endif
# ifdef WITH_BHYVE
if (virDriverLoadModule("bhyve", "bhyveRegister", false) < 0)
return -1;
#endif
#ifdef WITH_VZ
# endif
# ifdef WITH_VZ
if (virDriverLoadModule("vz", "vzRegister", false) < 0)
return -1;
# endif
#endif
return 0;
}