From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 14 May 2019 12:42:35 +0000 (+0200)
Subject: qemu: Remove unnecessary calls to qemuDomainStorageSourceAccessRevoke
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=83c579d0ae8333f80dc7cd8025c0e8a97bb91021;p=libvirt.git

qemu: Remove unnecessary calls to qemuDomainStorageSourceAccessRevoke

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 734df41f4a..8016c609f4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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)))