[libvirt] [PATCH 5/7] locking: Pass hypervisor driver name when acquiring locks

[Daniel P. Berrange]

On Thu, Sep 27, 2012 at 04:41:35PM +0200, Jiri Denemark wrote:
> This is required in case a lock manager needs to contact libvirtd in
> case of an unexpected event.
> ---
>  docs/internals/locking.html.in |  8 ++++++++
>  src/locking/domain_lock.c      | 25 +++++++++++++++++--------
>  src/locking/domain_lock.h      |  4 ++++
>  src/locking/lock_driver.h      |  1 +
>  src/qemu/qemu_driver.c         |  3 ++-
>  src/qemu/qemu_hotplug.c        | 15 ++++++++++-----
>  src/qemu/qemu_process.c        |  4 +++-
>  7 files changed, 45 insertions(+), 15 deletions(-)
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index e1be849..9b0e6b3 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -10692,7 +10692,8 @@ qemuDomainSnapshotCreateSingleDiskActive(struct qemud_driver *driver,
>      origdriver = disk->driverType;
>      disk->driverType = (char *) "raw"; /* Don't want to probe backing files */
>  
> -    if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0)
> +    if (virDomainLockDiskAttach(driver->lockManager, QEMU_URI_SCHEME,
> +                                vm, disk) < 0)
>          goto cleanup;

My inclination is that we ought to be passing 'qemu:///system' or 'qemu:///session'
instead of just 'qemu'.

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 :|