On Mon, Jun 20, 2011 at 01:43:46PM +0800, Daniel Veillard wrote: > 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 ? We now let the drvInit() method report errors instead, since it can do a better job. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list