qemu: Do not erase duplicate devices from namespace if error occurs

If the attempt to attach a device failed, we erased the
unattached device from the namespace. This resulted in erasing an
already attached device in case of a duplicate. We need to check
for existing file in the namespace in order to determine erasing
it in case of a failure.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1780508

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 89e03fdf72ef1737a4a9c35ac7a0b396f48a01ed..ac1d8ef1510c9e84c47684f1a0c2253b2c49742b 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7934,10 +7934,8 @@ qemuDomainStorageSourceAccessModify(virQEMUDriver *driver,
 
         revoke_nvme = true;
 
-        if (qemuDomainNamespaceSetupDisk(vm, src) < 0)
+        if (qemuDomainNamespaceSetupDisk(vm, src, &revoke_namespace) < 0)
             goto revoke;
-
-        revoke_namespace = true;
     }
 
     if (qemuSecuritySetImageLabel(driver, vm, src, chain, chain_top) < 0)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cb6a4e4ea51d6c4011b117ea221add3272a77d59..6743a8a742581710bafc42fd83fd4f2b56d7b610 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1685,9 +1685,8 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver,
         goto error;
     teardownmemlock = true;
 
-    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
         goto error;
-    teardowndevice = true;
 
     if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
         goto error;
@@ -2219,9 +2218,8 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver,
     if (rc == 1)
         need_release = true;
 
-    if (qemuDomainNamespaceSetupChardev(vm, chr) < 0)
+    if (qemuDomainNamespaceSetupChardev(vm, chr, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSecuritySetChardevLabel(driver, vm, chr) < 0)
         goto cleanup;
@@ -2332,9 +2330,8 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver,
     if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev) < 0)
         return -1;
 
-    if (qemuDomainNamespaceSetupRNG(vm, rng) < 0)
+    if (qemuDomainNamespaceSetupRNG(vm, rng, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupRNGCgroup(vm, rng) < 0)
         goto cleanup;
@@ -2476,9 +2473,8 @@ qemuDomainAttachMemory(virQEMUDriver *driver,
     if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0)
         goto cleanup;
 
-    if (qemuDomainNamespaceSetupMemory(vm, mem) < 0)
+    if (qemuDomainNamespaceSetupMemory(vm, mem, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupMemoryDevicesCgroup(vm, mem) < 0)
         goto cleanup;
@@ -2592,9 +2588,8 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver,
 
     added = true;
 
-    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
         goto cleanup;
@@ -2673,9 +2668,8 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver,
     if (qemuHostdevPrepareSCSIDevices(driver, vm->def->name, &hostdev, 1) < 0)
         return -1;
 
-    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
         goto cleanup;
@@ -2767,9 +2761,8 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver,
     if (qemuHostdevPrepareSCSIVHostDevices(driver, vm->def->name, &hostdev, 1) < 0)
         return -1;
 
-    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
         goto cleanup;
@@ -2894,9 +2887,8 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver,
         goto cleanup;
     added = true;
 
-    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
         goto cleanup;
@@ -3231,9 +3223,8 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver,
     if (qemuBuildInputDevStr(&devstr, vm->def, input, priv->qemuCaps) < 0)
         goto cleanup;
 
-    if (qemuDomainNamespaceSetupInput(vm, input) < 0)
+    if (qemuDomainNamespaceSetupInput(vm, input, &teardowndevice) < 0)
         goto cleanup;
-    teardowndevice = true;
 
     if (qemuSetupInputCgroup(vm, input) < 0)
         goto cleanup;

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 2f8ce842ec5e7df3abb299283feaa6874f19b9fd..4a06e5ceb76c0c057fab48be8c1a2fe56c4f6218 100644 (file)
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -610,7 +610,8 @@ qemuDomainSetupLaunchSecurity(virDomainObj *vm,
 
 static int
 qemuNamespaceMknodPaths(virDomainObj *vm,
-                        GSList *paths);
+                        GSList *paths,
+                        bool *created);
 
 
 int
@@ -657,7 +658,7 @@ qemuDomainBuildNamespace(virQEMUDriverConfig *cfg,
     if (qemuDomainSetupLaunchSecurity(vm, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, NULL) < 0)
         return -1;
 
     return 0;
@@ -1235,7 +1236,8 @@ qemuNamespacePrepareOneItem(qemuNamespaceMknodData *data,
 
 static int
 qemuNamespaceMknodPaths(virDomainObj *vm,
-                        GSList *paths)
+                        GSList *paths,
+                        bool *created)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
@@ -1280,15 +1282,13 @@ qemuNamespaceMknodPaths(virDomainObj *vm,
     if (qemuSecurityPreFork(driver->securityManager) < 0)
         goto cleanup;
 
-    if (virProcessRunInMountNamespace(vm->pid,
-                                      qemuNamespaceMknodHelper,
-                                      &data) < 0) {
-        qemuSecurityPostFork(driver->securityManager);
-        goto cleanup;
-    }
+    ret = virProcessRunInMountNamespace(vm->pid, qemuNamespaceMknodHelper,
+                                        &data);
     qemuSecurityPostFork(driver->securityManager);
 
-    ret = 0;
+    if (ret == 0 && created != NULL)
+        *created = true;
+
  cleanup:
     for (i = 0; i < data.nitems; i++) {
         if (data.items[i].bindmounted &&
@@ -1307,7 +1307,8 @@ qemuNamespaceMknodPaths(virDomainObj *vm,
 
 static int
 qemuNamespaceMknodPaths(virDomainObj *vm G_GNUC_UNUSED,
-                        GSList *paths G_GNUC_UNUSED)
+                        GSList *paths G_GNUC_UNUSED,
+                        bool *created G_GNUC_UNUSED)
 {
     virReportSystemError(ENOSYS, "%s",
                          _("Namespaces are not supported on this platform."));
@@ -1393,7 +1394,8 @@ qemuNamespaceUnlinkPaths(virDomainObj *vm,
 
 int
 qemuDomainNamespaceSetupDisk(virDomainObj *vm,
-                             virStorageSource *src)
+                             virStorageSource *src,
+                             bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
 
@@ -1403,7 +1405,7 @@ qemuDomainNamespaceSetupDisk(virDomainObj *vm,
     if (qemuDomainSetupDisk(src, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, created) < 0)
         return -1;
 
     return 0;
@@ -1437,7 +1439,8 @@ qemuDomainNamespaceTeardownDisk(virDomainObj *vm G_GNUC_UNUSED,
  */
 int
 qemuDomainNamespaceSetupHostdev(virDomainObj *vm,
-                                virDomainHostdevDef *hostdev)
+                                virDomainHostdevDef *hostdev,
+                                bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
 
@@ -1450,7 +1453,7 @@ qemuDomainNamespaceSetupHostdev(virDomainObj *vm,
                                &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, created) < 0)
         return -1;
 
     return 0;
@@ -1492,7 +1495,8 @@ qemuDomainNamespaceTeardownHostdev(virDomainObj *vm,
 
 int
 qemuDomainNamespaceSetupMemory(virDomainObj *vm,
-                               virDomainMemoryDef *mem)
+                               virDomainMemoryDef *mem,
+                               bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
 
@@ -1502,7 +1506,7 @@ qemuDomainNamespaceSetupMemory(virDomainObj *vm,
     if (qemuDomainSetupMemory(mem, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, created) < 0)
         return -1;
 
     return 0;
@@ -1530,7 +1534,8 @@ qemuDomainNamespaceTeardownMemory(virDomainObj *vm,
 
 int
 qemuDomainNamespaceSetupChardev(virDomainObj *vm,
-                                virDomainChrDef *chr)
+                                virDomainChrDef *chr,
+                                bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
 
@@ -1540,7 +1545,7 @@ qemuDomainNamespaceSetupChardev(virDomainObj *vm,
     if (qemuDomainSetupChardev(vm->def, chr, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, created) < 0)
         return -1;
 
     return 0;
@@ -1568,7 +1573,8 @@ qemuDomainNamespaceTeardownChardev(virDomainObj *vm,
 
 int
 qemuDomainNamespaceSetupRNG(virDomainObj *vm,
-                            virDomainRNGDef *rng)
+                            virDomainRNGDef *rng,
+                            bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
 
@@ -1578,7 +1584,7 @@ qemuDomainNamespaceSetupRNG(virDomainObj *vm,
     if (qemuDomainSetupRNG(rng, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if (qemuNamespaceMknodPaths(vm, paths, created) < 0)
         return -1;
 
     return 0;
@@ -1606,9 +1612,11 @@ qemuDomainNamespaceTeardownRNG(virDomainObj *vm,
 
 int
 qemuDomainNamespaceSetupInput(virDomainObj *vm,
-                              virDomainInputDef *input)
+                              virDomainInputDef *input,
+                              bool *created)
 {
     g_autoptr(virGSListString) paths = NULL;
+    int ret = 0;
 
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
         return 0;
@@ -1616,8 +1624,9 @@ qemuDomainNamespaceSetupInput(virDomainObj *vm,
     if (qemuDomainSetupInput(input, &paths) < 0)
         return -1;
 
-    if (qemuNamespaceMknodPaths(vm, paths) < 0)
+    if ((ret = qemuNamespaceMknodPaths(vm, paths, created)) < 0)
         return -1;
+
     return 0;
 }
 

diff --git a/src/qemu/qemu_namespace.h b/src/qemu/qemu_namespace.h
index 771d7873ef034e73c70a3f66f42eebf661e40703..020aca13d8857195bb2dc9f9b8db11a98598df56 100644 (file)
--- a/src/qemu/qemu_namespace.h
+++ b/src/qemu/qemu_namespace.h
@@ -50,37 +50,43 @@ void qemuDomainDestroyNamespace(virQEMUDriver *driver,
 bool qemuDomainNamespaceAvailable(qemuDomainNamespace ns);
 
 int qemuDomainNamespaceSetupDisk(virDomainObj *vm,
-                                 virStorageSource *src);
+                                 virStorageSource *src,
+                                 bool *created);
 
 int qemuDomainNamespaceTeardownDisk(virDomainObj *vm,
                                     virStorageSource *src);
 
 int qemuDomainNamespaceSetupHostdev(virDomainObj *vm,
-                                    virDomainHostdevDef *hostdev);
+                                    virDomainHostdevDef *hostdev,
+                                    bool *created);
 
 int qemuDomainNamespaceTeardownHostdev(virDomainObj *vm,
                                        virDomainHostdevDef *hostdev);
 
 int qemuDomainNamespaceSetupMemory(virDomainObj *vm,
-                                   virDomainMemoryDef *memory);
+                                   virDomainMemoryDef *memory,
+                                   bool *created);
 
 int qemuDomainNamespaceTeardownMemory(virDomainObj *vm,
                                       virDomainMemoryDef *memory);
 
 int qemuDomainNamespaceSetupChardev(virDomainObj *vm,
-                                    virDomainChrDef *chr);
+                                    virDomainChrDef *chr,
+                                    bool *created);
 
 int qemuDomainNamespaceTeardownChardev(virDomainObj *vm,
                                        virDomainChrDef *chr);
 
 int qemuDomainNamespaceSetupRNG(virDomainObj *vm,
-                                virDomainRNGDef *rng);
+                                virDomainRNGDef *rng,
+                                bool *created);
 
 int qemuDomainNamespaceTeardownRNG(virDomainObj *vm,
                                    virDomainRNGDef *rng);
 
 int qemuDomainNamespaceSetupInput(virDomainObj *vm,
-                                  virDomainInputDef *input);
+                                  virDomainInputDef *input,
+                                  bool *created);
 
 int qemuDomainNamespaceTeardownInput(virDomainObj *vm,
                                      virDomainInputDef *input);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 7487e126406bdc4c079488473cd5bf71e5b24dfd..c972c9080143305e89c1185e8198af73656fa911 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8452,7 +8452,7 @@ qemuProcessRefreshLegacyBlockjob(void *payload,
 
             if (disk->mirror->format &&
                 disk->mirror->format != VIR_STORAGE_FILE_RAW &&
-                (qemuDomainNamespaceSetupDisk(vm, disk->mirror) < 0 ||
+                (qemuDomainNamespaceSetupDisk(vm, disk->mirror, NULL) < 0 ||
                  qemuSetupImageChainCgroup(vm, disk->mirror) < 0 ||
                  qemuSecuritySetImageLabel(priv->driver, vm, disk->mirror,
                                            true, true) < 0))