mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
qemu: blockCopy: Allow reuse of raw image for shallow block copy
The documentation states that for shallow block copy the image has to have the same guest visible content as backing file of the current image if the file is being reused. This condition can be achieved also with a raw file (or a qcow without a backing file) so remove the condition that would disallow it. (This patch additionally fixes crash described in https://bugzilla.redhat.com/show_bug.cgi?id=1215569 )
This commit is contained in:
parent
18f24c65d5
commit
ebe0bd5590
@ -17122,11 +17122,17 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
|
||||
if (qemuDomainDetermineDiskChain(driver, vm, disk, false, true) < 0)
|
||||
goto endjob;
|
||||
|
||||
/* clear the _SHALLOW flag if there is only one layer */
|
||||
if (!disk->src->backingStore)
|
||||
flags &= ~VIR_DOMAIN_BLOCK_COPY_SHALLOW;
|
||||
|
||||
/* unless the user provides a pre-created file, shallow copy into a raw
|
||||
* file is not possible */
|
||||
if ((flags & VIR_DOMAIN_BLOCK_COPY_SHALLOW) &&
|
||||
mirror->format == VIR_STORAGE_FILE_RAW &&
|
||||
disk->src->backingStore->path) {
|
||||
!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT) &&
|
||||
mirror->format == VIR_STORAGE_FILE_RAW) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("disk '%s' has backing file, so raw shallow copy "
|
||||
_("shallow copy of disk '%s' into a raw file "
|
||||
"is not possible"),
|
||||
disk->dst);
|
||||
goto endjob;
|
||||
|
Loading…
Reference in New Issue
Block a user