]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Remove unnecessary calls to qemuDomainStorageSourceAccessRevoke
authorPeter Krempa <pkrempa@redhat.com>
Tue, 14 May 2019 12:42:35 +0000 (14:42 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 21 May 2019 12:22:06 +0000 (14:22 +0200)
Since 3decae00e90 qemuDomainStorageSourceAccessAllow revokes the
permissions it granted if it fails halfway, thus we can remove some
calls to qemuDomainStorageSourceAccessRevoke which tried to undo this
situation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index 734df41f4a46afb197efb5604c9993c8b7fe6c52..8016c609f468f457de946593ba725b150232600c 100644 (file)
@@ -15213,10 +15213,8 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
     }
 
     /* set correct security, cgroup and locking options on the new image */
-    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0) {
-        qemuDomainStorageSourceAccessRevoke(driver, vm, dd->src);
+    if (qemuDomainStorageSourceAccessAllow(driver, vm, dd->src, false, true) < 0)
         goto cleanup;
-    }
 
     dd->prepared = true;
 
@@ -17725,10 +17723,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
             qemuSecuritySetImageLabel(driver, vm, mirror, true) < 0)
             goto endjob;
     } else {
-        if (qemuDomainStorageSourceAccessAllow(driver, vm, mirror, false, true) < 0) {
-            qemuDomainStorageSourceAccessRevoke(driver, vm, mirror);
+        if (qemuDomainStorageSourceAccessAllow(driver, vm, mirror, false, true) < 0)
             goto endjob;
-        }
     }
 
     if (!(job = qemuBlockJobDiskNew(disk, QEMU_BLOCKJOB_TYPE_COPY, device)))