locking: Pass hypervisor driver name when acquiring locks

This is required in case a lock manager needs to contact libvirtd in
case of an unexpected event.

diff --git a/docs/internals/locking.html.in b/docs/internals/locking.html.in
index e84321b67dbc775da93f606133eca1d6e9fdec48..34e50c7b6ac8f55ab46a7a9c862849a0640a21b6 100644 (file)
--- a/docs/internals/locking.html.in
+++ b/docs/internals/locking.html.in
@@ -183,6 +183,10 @@
           .key = "pid",
           .value = { .i = dom->pid },
         },
+        { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
+          .key = "uri",
+          .value = { .cstr = driver->uri },
+        },
       };
       mgr = virLockManagerNew(lockPlugin,
                               VIR_LOCK_MANAGER_TYPE_DOMAIN,
@@ -225,6 +229,10 @@
           .key = "pid",
           .value = { .i = dom->pid },
         },
+        { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
+          .key = "uri",
+          .value = { .cstr = driver->uri },
+        },
       };
       mgr = virLockManagerNew(lockPlugin,
                               VIR_LOCK_MANAGER_TYPE_DOMAIN,

diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 3417361bd2ae9f30bee0ec67e26c1890ab6dc11d..9d6fd6a6e88f738d6ddb4d7e53bd1548825fd652 100644 (file)
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -97,6 +97,7 @@ static int virDomainLockManagerAddDisk(virLockManagerPtr lock,
 }
 
 static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin,
+                                                 const char *uri,
                                                  virDomainObjPtr dom,
                                                  bool withResources)
 {
@@ -118,6 +119,10 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin,
           .key = "pid",
           .value = { .i = dom->pid },
         },
+        { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING,
+          .key = "uri",
+          .value = { .cstr = uri },
+        },
     };
     VIR_DEBUG("plugin=%p dom=%p withResources=%d",
               plugin, dom, withResources);
@@ -152,6 +157,7 @@ error:
 
 
 int virDomainLockProcessStart(virLockManagerPluginPtr plugin,
+                              const char *uri,
                               virDomainObjPtr dom,
                               bool paused,
                               int *fd)
@@ -163,7 +169,7 @@ int virDomainLockProcessStart(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p paused=%d fd=%p",
               plugin, dom, paused, fd);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, true)))
+    if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true)))
         return -1;
 
     if (paused)
@@ -186,7 +192,7 @@ int virDomainLockProcessPause(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p state=%p",
               plugin, dom, state);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, true)))
+    if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true)))
         return -1;
 
     ret = virLockManagerRelease(lock, state, 0);
@@ -196,6 +202,7 @@ int virDomainLockProcessPause(virLockManagerPluginPtr plugin,
 }
 
 int virDomainLockProcessResume(virLockManagerPluginPtr plugin,
+                               const char *uri,
                                virDomainObjPtr dom,
                                const char *state)
 {
@@ -205,7 +212,7 @@ int virDomainLockProcessResume(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p state=%s",
               plugin, dom, NULLSTR(state));
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, true)))
+    if (!(lock = virDomainLockManagerNew(plugin, uri, dom, true)))
         return -1;
 
     ret = virLockManagerAcquire(lock, state, 0, NULL);
@@ -224,7 +231,7 @@ int virDomainLockProcessInquire(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p state=%p",
               plugin, dom, state);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, true)))
+    if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, true)))
         return -1;
 
     ret = virLockManagerInquire(lock, state, 0);
@@ -235,6 +242,7 @@ int virDomainLockProcessInquire(virLockManagerPluginPtr plugin,
 
 
 int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
+                            const char *uri,
                             virDomainObjPtr dom,
                             virDomainDiskDefPtr disk)
 {
@@ -244,7 +252,7 @@ int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p disk=%p",
               plugin, dom, disk);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, false)))
+    if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false)))
         return -1;
 
     if (virDomainLockManagerAddDisk(lock, disk) < 0)
@@ -271,7 +279,7 @@ int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p disk=%p",
               plugin, dom, disk);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, false)))
+    if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false)))
         return -1;
 
     if (virDomainLockManagerAddDisk(lock, disk) < 0)
@@ -290,6 +298,7 @@ cleanup:
 
 
 int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
+                             const char *uri,
                              virDomainObjPtr dom,
                              virDomainLeaseDefPtr lease)
 {
@@ -299,7 +308,7 @@ int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p lease=%p",
               plugin, dom, lease);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, false)))
+    if (!(lock = virDomainLockManagerNew(plugin, uri, dom, false)))
         return -1;
 
     if (virDomainLockManagerAddLease(lock, lease) < 0)
@@ -326,7 +335,7 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin,
     VIR_DEBUG("plugin=%p dom=%p lease=%p",
               plugin, dom, lease);
 
-    if (!(lock = virDomainLockManagerNew(plugin, dom, false)))
+    if (!(lock = virDomainLockManagerNew(plugin, NULL, dom, false)))
         return -1;
 
     if (virDomainLockManagerAddLease(lock, lease) < 0)

diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h
index 3bedeb1ecca1a3bc377abb70f7870646d9fe6fa3..eefe6cd52f7cd72852f59489e32142b4344970bc 100644 (file)
--- a/src/locking/domain_lock.h
+++ b/src/locking/domain_lock.h
@@ -27,6 +27,7 @@
 # include "lock_manager.h"
 
 int virDomainLockProcessStart(virLockManagerPluginPtr plugin,
+                              const char *uri,
                               virDomainObjPtr dom,
                               bool paused,
                               int *fd);
@@ -34,6 +35,7 @@ int virDomainLockProcessPause(virLockManagerPluginPtr plugin,
                               virDomainObjPtr dom,
                               char **state);
 int virDomainLockProcessResume(virLockManagerPluginPtr plugin,
+                               const char *uri,
                                virDomainObjPtr dom,
                                const char *state);
 int virDomainLockProcessInquire(virLockManagerPluginPtr plugin,
@@ -41,6 +43,7 @@ int virDomainLockProcessInquire(virLockManagerPluginPtr plugin,
                                 char **state);
 
 int virDomainLockDiskAttach(virLockManagerPluginPtr plugin,
+                            const char *uri,
                             virDomainObjPtr dom,
                             virDomainDiskDefPtr disk);
 int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
@@ -48,6 +51,7 @@ int virDomainLockDiskDetach(virLockManagerPluginPtr plugin,
                             virDomainDiskDefPtr disk);
 
 int virDomainLockLeaseAttach(virLockManagerPluginPtr plugin,
+                             const char *uri,
                              virDomainObjPtr dom,
                              virDomainLeaseDefPtr lease);
 int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin,

diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h
index c33aea7ea2fa21a88936ba36181aec982ee54c6b..8fe7ceb5765126515bc56f8878ddd371111e4692 100644 (file)
--- a/src/locking/lock_driver.h
+++ b/src/locking/lock_driver.h
@@ -155,6 +155,7 @@ typedef int (*virLockDriverDeinit)(void);
  * - uuid: the domain uuid (uuid)
  * - name: the domain name (string)
  * - pid: process ID to own/owning the lock (unsigned int)
+ * - uri: URI for connecting to the driver the domain belongs to (string)
  *
  * Returns 0 if successful initialized a new context, -1 on error
  */

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index ca2f6947a1baa90443e80f846b7db4b796be510c..2c7f70cceaae7c4a5eba2ac8d9de12561944ab97 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -57,6 +57,7 @@ struct qemud_driver {
     virThreadPoolPtr workerPool;
 
     int privileged;
+    const char *uri;
 
     uid_t user;
     gid_t group;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a10dfb9c7d6b88e57dae5f50988c7905a226c9b9..decf0fbb7e39484018c6eeeeb59a11c29fdce6da 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -611,7 +611,9 @@ qemudStartup(int privileged) {
         return -1;
     }
     qemuDriverLock(qemu_driver);
+
     qemu_driver->privileged = privileged;
+    qemu_driver->uri = privileged ? "qemu:///system" : "qemu:///session";
 
     /* Don't have a dom0 so start from 1 */
     qemu_driver->nextvmid = 1;
@@ -860,9 +862,7 @@ qemudStartup(int privileged) {
 
     virHashForEach(qemu_driver->domains.objs, qemuDomainNetsRestart, NULL);
 
-    conn = virConnectOpen(qemu_driver->privileged ?
-                          "qemu:///system" :
-                          "qemu:///session");
+    conn = virConnectOpen(qemu_driver->uri);
 
     qemuProcessReconnectAll(conn, qemu_driver);
 
@@ -10695,7 +10695,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, driver->uri,
+                                vm, disk) < 0)
         goto cleanup;
     if (cgroup && qemuSetupDiskCgroup(driver, vm, cgroup, disk) < 0) {
         if (virDomainLockDiskDetach(driver->lockManager, vm, disk) < 0)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a738b19c1039cbbc260d42c42b6421777948775f..d6d161fbea3e239be49b6e692972a871ba240d33 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -88,7 +88,8 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver,
         return -1;
     }
 
-    if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0)
+    if (virDomainLockDiskAttach(driver->lockManager, driver->uri,
+                                vm, disk) < 0)
         return -1;
 
     if (virSecurityManagerSetImageLabel(driver->securityManager,
@@ -217,7 +218,8 @@ int qemuDomainAttachPciDiskDevice(virConnectPtr conn,
         }
     }
 
-    if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0)
+    if (virDomainLockDiskAttach(driver->lockManager, driver->uri,
+                                vm, disk) < 0)
         return -1;
 
     if (virSecurityManagerSetImageLabel(driver->securityManager,
@@ -449,7 +451,8 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
         }
     }
 
-    if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0)
+    if (virDomainLockDiskAttach(driver->lockManager, driver->uri,
+                                vm, disk) < 0)
         return -1;
 
     if (virSecurityManagerSetImageLabel(driver->securityManager,
@@ -572,7 +575,8 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn,
         }
     }
 
-    if (virDomainLockDiskAttach(driver->lockManager, vm, disk) < 0)
+    if (virDomainLockDiskAttach(driver->lockManager, driver->uri,
+                                vm, disk) < 0)
         return -1;
 
     if (virSecurityManagerSetImageLabel(driver->securityManager,
@@ -2389,7 +2393,8 @@ int qemuDomainAttachLease(struct qemud_driver *driver,
     if (virDomainLeaseInsertPreAlloc(vm->def) < 0)
         return -1;
 
-    if (virDomainLockLeaseAttach(driver->lockManager, vm, lease) < 0) {
+    if (virDomainLockLeaseAttach(driver->lockManager, driver->uri,
+                                 vm, lease) < 0) {
         virDomainLeaseInsertPreAlloced(vm->def, NULL);
         return -1;
     }

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 31909b7a1a4a9e925ad4904884642586be237436..8c4bd9e74bb01f0824f5439e9a5c1148318ee0df 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2597,6 +2597,7 @@ static int qemuProcessHook(void *data)
     if (virSecurityManagerSetSocketLabel(h->driver->securityManager, h->vm->def) < 0)
         goto cleanup;
     if (virDomainLockProcessStart(h->driver->lockManager,
+                                  h->driver->uri,
                                   h->vm,
                                   /* QEMU is always pased initially */
                                   true,
@@ -2666,7 +2667,8 @@ qemuProcessStartCPUs(struct qemud_driver *driver, virDomainObjPtr vm,
     qemuDomainObjPrivatePtr priv = vm->privateData;
 
     VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState));
-    if (virDomainLockProcessResume(driver->lockManager, vm, priv->lockState) < 0) {
+    if (virDomainLockProcessResume(driver->lockManager, driver->uri,
+                                   vm, priv->lockState) < 0) {
         /* Don't free priv->lockState on error, because we need
          * to make sure we have state still present if the user
          * tries to resume again