[libvirt] [PATCH v4 13/23] lock_manager: Allow disabling configFile for virLockManagerPluginNew
In some cases we might want to not load the lock driver config.
Alter virLockManagerPluginNew() and the lock drivers to cope with
this fact.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: John Ferlan <jferlan(a)redhat.com>
---
src/locking/lock_driver.h | 4 ++++
src/locking/lock_driver_lockd.c | 4 +++-
src/locking/lock_driver_sanlock.c | 4 +++-
src/locking/lock_manager.c | 10 +++++++---
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h
index 8d236471d4..f938b1df2a 100644
--- a/src/locking/lock_driver.h
+++ b/src/locking/lock_driver.h
@@ -124,6 +124,7 @@ struct _virLockManagerParam {
/**
* virLockDriverInit:
* @version: the libvirt requested plugin ABI version
+ * @configFile: path to config file
* @flags: the libvirt requested plugin optional extras
*
* Allow the plugin to validate the libvirt requested
@@ -131,6 +132,9 @@ struct _virLockManagerParam {
* to block its use in versions of libvirtd which are
* too old to support key features.
*
+ * The @configFile variable points to config file that the driver
+ * should load. If NULL, no config file should be loaded.
+ *
* NB: A plugin may be loaded multiple times, for different
* libvirt drivers (eg QEMU, LXC, UML)
*
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 3068a72507..7566c4abe1 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -365,8 +365,10 @@ static int virLockManagerLockDaemonInit(unsigned int version,
driver->requireLeaseForDisks = true;
driver->autoDiskLease = true;
- if (virLockManagerLockDaemonLoadConfig(configFile) < 0)
+ if (configFile &&
+ virLockManagerLockDaemonLoadConfig(configFile) < 0) {
goto error;
+ }
if (driver->autoDiskLease) {
if (driver->fileLockSpaceDir &&
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 9393e7d9a2..66953c70d5 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -450,8 +450,10 @@ static int virLockManagerSanlockInit(unsigned int version,
goto error;
}
- if (virLockManagerSanlockLoadConfig(driver, configFile) < 0)
+ if (configFile &&
+ virLockManagerSanlockLoadConfig(driver, configFile) < 0) {
goto error;
+ }
if (driver->autoDiskLease && !driver->hostID) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 4ef9f9e692..84d0c30d37 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -105,6 +105,8 @@ static void virLockManagerLogParams(size_t nparams,
/**
* virLockManagerPluginNew:
* @name: the name of the plugin
+ * @driverName: the hypervisor driver that loads the plugin
+ * @configDir: path to dir where config files are stored
* @flag: optional plugin flags
*
* Attempt to load the plugin $(libdir)/libvirt/lock-driver/(a)name.so
@@ -130,11 +132,13 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name,
char *configFile = NULL;
VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x",
- name, driverName, configDir, flags);
+ name, NULLSTR(driverName), NULLSTR(configDir), flags);
- if (virAsprintf(&configFile, "%s/%s-%s.conf",
- configDir, driverName, name) < 0)
+ if (driverName && configDir &&
+ virAsprintf(&configFile, "%s/%s-%s.conf",
+ configDir, driverName, name) < 0) {
return NULL;
+ }
if (STREQ(name, "nop")) {
driver = &virLockDriverNop;
--
2.16.4