137 lines
6.6 KiB
Diff
137 lines
6.6 KiB
Diff
|
From 2d27c71da092e9232c2d79738a431c04db649a96 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <2d27c71da092e9232c2d79738a431c04db649a96@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Mon, 30 Mar 2020 17:21:46 +0200
|
||
|
|
Subject: [PATCH] qemuBlockStorageSourceGetURI: Pass through query component
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
If the storage source has the query part set, format it in the output.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit 216860dd8b93c7da4d625055cf353e0eedda6093)
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
|
||
|
|
Message-Id: <832f573fd69341b7d730925c9df5b23e5f168408.1585581552.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_block.c | 2 ++
|
||
|
|
src/qemu/qemu_domain.c | 9 +++++++++
|
||
|
|
tests/qemuxml2argvdata/disk-cdrom-network.args | 4 ++--
|
||
|
|
.../disk-cdrom-network.x86_64-2.12.0.args | 4 ++--
|
||
|
|
.../disk-cdrom-network.x86_64-latest.args | 3 ++-
|
||
|
|
tests/qemuxml2argvdata/disk-cdrom-network.xml | 2 +-
|
||
|
|
.../disk-network-http.x86_64-latest.args | 5 +++--
|
||
|
|
7 files changed, 21 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
|
||
|
|
index e7577c1312..6790f05ff7 100644
|
||
|
|
--- a/src/qemu/qemu_block.c
|
||
|
|
+++ b/src/qemu/qemu_block.c
|
||
|
|
@@ -437,6 +437,8 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ uri->query = g_strdup(src->query);
|
||
|
|
+
|
||
|
|
uri->server = g_strdup(src->hosts->name);
|
||
|
|
|
||
|
|
return g_steal_pointer(&uri);
|
||
|
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
||
|
|
index 4007b4dbda..bb28716ff0 100644
|
||
|
|
--- a/src/qemu/qemu_domain.c
|
||
|
|
+++ b/src/qemu/qemu_domain.c
|
||
|
|
@@ -7107,6 +7107,15 @@ qemuDomainValidateStorageSource(virStorageSourcePtr src,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (src->query &&
|
||
|
|
+ (actualType != VIR_STORAGE_TYPE_NETWORK ||
|
||
|
|
+ (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
|
||
|
|
+ src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP))) {
|
||
|
|
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||
|
|
+ _("query is supported only with HTTP(S) protocols"));
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
|
||
|
|
index be19bad68a..81ff324a0f 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
|
||
|
|
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
|
||
|
|
@@ -30,8 +30,8 @@ id=drive-ide0-0-0,readonly=on \
|
||
|
|
-drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
|
||
|
|
id=drive-ide0-0-1,readonly=on \
|
||
|
|
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
||
|
|
--drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\
|
||
|
|
-id=drive-ide0-1-0,readonly=on \
|
||
|
|
+-drive 'file=https://host.name:443/url/path/file.iso?test=val,format=raw,\
|
||
|
|
+if=none,id=drive-ide0-1-0,readonly=on' \
|
||
|
|
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
|
||
|
|
-drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\
|
||
|
|
id=drive-ide0-1-1,readonly=on \
|
||
|
|
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
|
||
|
|
index 1ece3d6f46..81f6b400aa 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
|
||
|
|
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
|
||
|
|
@@ -32,8 +32,8 @@ id=drive-ide0-0-0,readonly=on \
|
||
|
|
-drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\
|
||
|
|
id=drive-ide0-0-1,readonly=on \
|
||
|
|
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
||
|
|
--drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\
|
||
|
|
-id=drive-ide0-1-0,readonly=on \
|
||
|
|
+-drive 'file=https://host.name:443/url/path/file.iso?test=val,format=raw,\
|
||
|
|
+if=none,id=drive-ide0-1-0,readonly=on' \
|
||
|
|
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
|
||
|
|
-drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\
|
||
|
|
id=drive-ide0-1-1,readonly=on \
|
||
|
|
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
|
||
|
|
index 0b4ac07f07..2515b256d0 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
|
||
|
|
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
|
||
|
|
@@ -37,7 +37,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||
|
|
-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw",\
|
||
|
|
"file":"libvirt-3-storage"}' \
|
||
|
|
-device ide-cd,bus=ide.0,unit=1,drive=libvirt-3-format,id=ide0-0-1 \
|
||
|
|
--blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.iso",\
|
||
|
|
+-blockdev '{"driver":"https",\
|
||
|
|
+"url":"https://host.name:443/url/path/file.iso?test=val",\
|
||
|
|
"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
|
||
|
|
-blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw",\
|
||
|
|
"file":"libvirt-2-storage"}' \
|
||
|
|
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.xml b/tests/qemuxml2argvdata/disk-cdrom-network.xml
|
||
|
|
index 0bdc0e1883..44473f8ad4 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/disk-cdrom-network.xml
|
||
|
|
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.xml
|
||
|
|
@@ -39,7 +39,7 @@
|
||
|
|
</disk>
|
||
|
|
<disk type='network' device='cdrom'>
|
||
|
|
<driver name='qemu' type='raw'/>
|
||
|
|
- <source protocol='https' name='/url/path/file.iso'>
|
||
|
|
+ <source protocol='https' name='/url/path/file.iso' query='test=val'>
|
||
|
|
<host name='host.name' port='443'/>
|
||
|
|
</source>
|
||
|
|
<target dev='hdc' bus='ide'/>
|
||
|
|
diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
|
||
|
|
index 46aa5f23ce..d1bf0b9caa 100644
|
||
|
|
--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
|
||
|
|
+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
|
||
|
|
@@ -54,8 +54,9 @@ id=virtio-disk2 \
|
||
|
|
-object secret,id=libvirt-1-storage-httpcookie-secret0,\
|
||
|
|
data=DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\
|
||
|
|
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
|
||
|
|
--blockdev '{"driver":"https","url":"https://example.org:1234/test4.img",\
|
||
|
|
-"sslverify":false,"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
|
||
|
|
+-blockdev '{"driver":"https",\
|
||
|
|
+"url":"https://example.org:1234/test4.img?par=val&other=ble","sslverify":false,\
|
||
|
|
+"cookie-secret":"libvirt-1-storage-httpcookie-secret0",\
|
||
|
|
"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
|
||
|
|
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
|
||
|
|
"file":"libvirt-1-storage"}' \
|
||
|
|
--
|
||
|
|
2.26.0
|
||
|
|
|