From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 25 Jun 2019 14:16:21 +0000 (+0200)
Subject: qemu: command: Use 'actualType' when deciding whether to use disk format
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=76e3de37bf9bff3eabb1fadd9dddcd723719eac1;p=libvirt.git

qemu: command: Use 'actualType' when deciding whether to use disk format

qemuBuildDriveSourceStr omits the disk format string when we are
emulating a 'fat' filesystem from a directory. The logic should decide
based on the 'actualType' as a disk type=pool may be converted to a
directory.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 85d1e3b7b0..688dc324c6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1730,7 +1730,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
     }
 
     if (disk->src->format > 0 &&
-        disk->src->type != VIR_STORAGE_TYPE_DIR) {
+        actualType != VIR_STORAGE_TYPE_DIR) {
         const char *qemuformat = virStorageFileFormatTypeToString(disk->src->format);
         if (rawluks)
             qemuformat = "luks";