External/libvirt
1
0
Fork 0
Code

qemu: block: Implement readahead and timeout properties for 'curl' driver

Browse Source 
Pass in the correct fields.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-06 07:09:22 +01:00
parent 06d3e8d539
commit 9cac141cd6
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_block.c
View File

@ -722,6 +722,8 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
"S:password-secret", passwordalias, "S:password-secret", passwordalias,
"T:sslverify", src->sslverify, "T:sslverify", src->sslverify,
"S:cookie-secret", cookiealias, "S:cookie-secret", cookiealias,
"P:timeout", src->timeout,
"P:readahead", src->readahead,
NULL)); NULL));
return ret; return ret;

6
tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
View File

@ -29,13 +29,15 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-boot strict=on \ -boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-blockdev '{"driver":"http","url":"http://example.org:80/test.img",\ -blockdev '{"driver":"http","url":"http://example.org:80/test.img",\
"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ "timeout":1234,"node-name":"libvirt-4-storage","auto-read-only":true,\
"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\
"file":"libvirt-4-storage"}' \ "file":"libvirt-4-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
id=virtio-disk0,bootindex=1 \ id=virtio-disk0,bootindex=1 \
-blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\ -blockdev '{"driver":"https","url":"https://example.org:443/test2.img",\
"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ "readahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,\
"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw",\
"file":"libvirt-3-storage"}' \ "file":"libvirt-3-storage"}' \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\

2
tests/qemuxml2argvdata/disk-network-http.xml
View File

@ -17,6 +17,7 @@
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='http' name='test.img'> <source protocol='http' name='test.img'>
<host name='example.org'/> <host name='example.org'/>
<timeout seconds='1234'/>
</source> </source>
<target dev='vda' bus='virtio'/> <target dev='vda' bus='virtio'/>
</disk> </disk>
@ -24,6 +25,7 @@
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='https' name='test2.img'> <source protocol='https' name='test2.img'>
<host name='example.org'/> <host name='example.org'/>
<readahead size='1024'/>
</source> </source>
<target dev='vdb' bus='virtio'/> <target dev='vdb' bus='virtio'/>
</disk> </disk>