[libvirt] [PATCH 2/3] qemu: domain: Allow 'VIR_STORAGE_TYPE_VOLUME' disks with 'fat' format
The storage volume may in fact convert into a directory when starting
the VM so that it may be actually possible to use it.
This is a regression caused by c9b27af32d5 as moving the check to
validation time without adjustment causes problems as the volumes are
not translated yet.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 1 +
tests/qemuxml2argvdata/disk-source-pool.args | 4 ++++
tests/qemuxml2argvdata/disk-source-pool.xml | 10 +++++++++-
tests/qemuxml2xmloutdata/disk-source-pool.xml | 7 +++++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1326c3d6b1..5b72b7f7bf 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5078,6 +5078,7 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
}
if (src->format == VIR_STORAGE_FILE_FAT &&
+ actualType != VIR_STORAGE_TYPE_VOLUME &&
actualType != VIR_STORAGE_TYPE_DIR) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("storage format 'fat' is supported only with
'dir' "
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.args
index 676ffb5768..10e6fcf1f2 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -32,4 +32,8 @@ readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-2 \
-device ide-hd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2,bootindex=1 \
+-drive file=fat:/some/dir/device/vol1,format=fat,if=none,id=drive-virtio-disk0,\
+readonly=on \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+id=virtio-disk0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/disk-source-pool.xml
b/tests/qemuxml2argvdata/disk-source-pool.xml
index ed326d8d49..96bcae9a57 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.xml
+++ b/tests/qemuxml2argvdata/disk-source-pool.xml
@@ -37,9 +37,17 @@
<target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</disk>
+ <disk type='volume' device='disk'>
+ <driver name='qemu' type='fat'/>
+ <source pool='pool-disk' volume='dir+vol1'/>
+ <target dev='vda' bus='virtio'/>
+ <readonly/>
+ </disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <memballoon model='virtio'/>
+ <memballoon model='virtio'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 567b22db84..7e3961381e 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -37,6 +37,13 @@
<target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='2'/>
</disk>
+ <disk type='volume' device='disk'>
+ <driver name='qemu' type='fat'/>
+ <source pool='pool-disk' volume='dir+vol1'/>
+ <target dev='vda' bus='virtio'/>
+ <readonly/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ </disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
</controller>
--
2.21.0