From f1650a0ed4fc226325e5a9772e6d04a95457f470 Mon Sep 17 00:00:00 2001
Message-Id: <f1650a0ed4fc226325e5a9772e6d04a95457f470@dist-git>
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Mar 2020 22:12:06 +0100
Subject: [PATCH] qemu: block: Implement readahead and timeout properties for
 'curl' driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pass in the correct fields.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 9cac141cd67d2213074fd146b58812da8fe30603)
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
Message-Id: <71cba24b72024183752fe9873d0fd5f01caf122b.1584391727.git.pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_block.c                                       | 2 ++
 tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args | 6 ++++--
 tests/qemuxml2argvdata/disk-network-http.xml                | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 80a8c7296d..b077e2e02f 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -722,6 +722,8 @@ qemuBlockStorageSourceGetCURLProps(virStorageSourcePtr src,
                                           "S:password-secret", passwordalias,
                                           "T:sslverify", src->sslverify,
                                           "S:cookie-secret", cookiealias,
+                                          "P:timeout", src->timeout,
+                                          "P:readahead", src->readahead,
                                           NULL));
 
     return ret;
diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
index cbb69e16a9..2f2849ebdf 100644
--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
@@ -28,13 +28,15 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -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",\
 "file":"libvirt-4-storage"}' \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=libvirt-4-format,\
 id=virtio-disk0,bootindex=1 \
 -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",\
 "file":"libvirt-3-storage"}' \
 -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=libvirt-3-format,\
diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2argvdata/disk-network-http.xml
index 6acf75cf65..20024c732e 100644
--- a/tests/qemuxml2argvdata/disk-network-http.xml
+++ b/tests/qemuxml2argvdata/disk-network-http.xml
@@ -17,6 +17,7 @@
       <driver name='qemu' type='raw'/>
       <source protocol='http' name='test.img'>
         <host name='example.org'/>
+        <timeout seconds='1234'/>
       </source>
       <target dev='vda' bus='virtio'/>
     </disk>
@@ -24,6 +25,7 @@
       <driver name='qemu' type='raw'/>
       <source protocol='https' name='test2.img'>
         <host name='example.org'/>
+        <readahead size='1024'/>
       </source>
       <target dev='vdb' bus='virtio'/>
     </disk>
-- 
2.25.1