From: Peter Krempa Date: Fri, 20 Aug 2021 11:26:13 +0000 (+0200) Subject: qemu: block: Use correct format name when formatting overlay of qcow2+luks X-Git-Tag: v7.7.0-rc1~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ab65583588702eb15b9f323fa57b8b5441a8ea;p=thirdparty%2Flibvirt.git qemu: block: Use correct format name when formatting overlay of qcow2+luks A logic bug in the code creating overlays on existing images resulted into wrongly using "luks" instead of "qcow2" for the backing format if the backing image is an luks-encrypted qcow2. The special format munging is needed only for raw luks images. In practice the impact is not as critical as to use encrypted images in the backing chain the user must fully describe the backing chain including backing images to provide encryption keys, which overrides the metadata recorded in the qcow2 header. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e09c7e66c8..0bc92f6a23 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2264,7 +2264,8 @@ qemuBlockStorageSourceCreateAddBacking(virStorageSource *backing, return 0; if (format) { - if (backing->encryption && + if (backing->format == VIR_STORAGE_FILE_RAW && + backing->encryption && backing->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) backingFormatStr = "luks"; else