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

Revert "lock_manager: Allow disabling configFile for virLockManagerPluginNew"

Browse Source 
This reverts commit 35b5b244da.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2018-10-02 15:09:45 +02:00
parent 90d4caf5b9
commit 84ee32685a
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/locking/lock_driver.h
View File

@ -124,7 +124,6 @@ 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
@ -132,9 +131,6 @@ 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)
*

4
src/locking/lock_driver_lockd.c
View File

@ -371,10 +371,8 @@ static int virLockManagerLockDaemonInit(unsigned int version,
driver->requireLeaseForDisks = true;
driver->autoDiskLease = true;
if (configFile &&
virLockManagerLockDaemonLoadConfig(configFile) < 0) {
if (virLockManagerLockDaemonLoadConfig(configFile) < 0)
goto error;
}
if (driver->autoDiskLease) {
if (driver->fileLockSpaceDir &&

4
src/locking/lock_driver_sanlock.c
View File

@ -446,10 +446,8 @@ static int virLockManagerSanlockInit(unsigned int version,
goto error;
}
if (configFile &&
virLockManagerSanlockLoadConfig(driver, configFile) < 0) {
if (virLockManagerSanlockLoadConfig(driver, configFile) < 0)
goto error;
}
if (driver->autoDiskLease && !driver->hostID) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

10
src/locking/lock_manager.c
View File

@ -104,8 +104,6 @@ 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/@name.so
@ -131,13 +129,11 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name,
char *configFile = NULL;
VIR_DEBUG("name=%s driverName=%s configDir=%s flags=0x%x",
name, NULLSTR(driverName), NULLSTR(configDir), flags);
name, driverName, configDir, flags);
if (driverName && configDir &&
virAsprintf(&configFile, "%s/%s-%s.conf",
configDir, driverName, name) < 0) {
if (virAsprintf(&configFile, "%s/%s-%s.conf",
configDir, driverName, name) < 0)
return NULL;
}
if (STREQ(name, "nop")) {
driver = &virLockDriverNop;