On Fri, Jun 17, 2011 at 01:38:19PM +0100, Daniel P. Berrange wrote:
Allow a 'configFile' parameter to be passed into the lock
drivers to provide configuration. Wire up the QEMU driver
to pass in file names '/etc/libvirt/qemu-$NAME.conf
eg qemu-sanlock.conf
[...]
@@ -162,11 +163,8 @@ virLockManagerPluginPtr
virLockManagerPluginNew(const char *name,
}
}
- if (driver->drvInit(VIR_LOCK_MANAGER_VERSION, flags) < 0) {
- virLockError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("plugin ABI is not compatible"));
+ if (driver->drvInit(VIR_LOCK_MANAGER_VERSION, configFile, flags) < 0)
goto cleanup;
- }
if (VIR_ALLOC(plugin) < 0) {
virReportOOMError();
ACK, patch looks fine to me, I'm just surprized by the above chunk
which now seems to lack the error reporting, were we reporting twice,
or should we pass on this condition ?
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit
http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine
http://rpmfind.net/
http://veillard.com/ | virtualization library
http://libvirt.org/