From: Peter Krempa Date: Tue, 14 May 2019 15:35:45 +0000 (+0200) Subject: qemu: Simplify allowing access to storage file for block copy X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=32ec5fee02c01296622f66a512c44022cc73d308;p=libvirt.git qemu: Simplify allowing access to storage file for block copy One code path open-coded qemuDomainStorageSourceChainAccessAllow badly and also did not integrate with the locking code. Replace the separate calls with qemuDomainStorageSourceChainAccessAllow which does everything internally. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d5afd457a..0ca217bf08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17778,9 +17778,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, /* note that we don't really know whether a part of the backing chain * is shared so rolling this back is not as easy. Thus we do it only * if there's a backing chain */ - if (qemuDomainNamespaceSetupDisk(vm, mirror) < 0 || - qemuSetupImageChainCgroup(vm, mirror) < 0 || - qemuSecuritySetImageLabel(driver, vm, mirror, true) < 0) + if (qemuDomainStorageSourceChainAccessAllow(driver, vm, mirror) < 0) goto endjob; } else { if (qemuDomainStorageSourceAccessAllow(driver, vm, mirror, false, true) < 0)