From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 25 Feb 2020 12:28:10 +0000 (+0100)
Subject: qemu: domain: Convert detected 'iso' image format into 'raw'
X-Git-Tag: v6.1.0-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c6e6f55a5ded357c39b92629cd523e51f6ca8f9;p=thirdparty%2Flibvirt.git

qemu: domain: Convert detected 'iso' image format into 'raw'

While our code can detect ISO as a separate format, qemu does not use it
as such and just passes it through as raw. Add conversion for detected
parts of the backing chain so that the validation code does not reject
it right away.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 446a517df9..a28b51c10e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11493,6 +11493,10 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver,
         return -1;
 
     for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) {
+        /* convert detected ISO format to 'raw' as qemu would not understand it */
+        if (n->format == VIR_STORAGE_FILE_ISO)
+            n->format = VIR_STORAGE_FILE_RAW;
+
         if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0)
             return -1;