External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove unnecessary calls to qemuDomainStorageSourceAccessRevoke

Browse Source 
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>
This commit is contained in:
Peter Krempa 2019-05-14 14:42:35 +02:00
parent 8787032c5c
commit 83c579d0ae
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_driver.c
View 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)))