From nobody Wed May 1 14:16:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585324303; cv=none; d=zohomail.com; s=zohoarc; b=IW4WPnlL2K6CjSgxqlXhw5rBjdUWVRGVIEmwH8RDz+2BDCuNjLoge+to1B9YfROQHecVCwRWkcXmChcKNMcypdo5z5QhsjnhARmRw+5neVMmM1VsiZGT5RcM32CG6lwspoEpScjTmVEo3IJ6s8CGLNkZxS2vLXZgEX6w6ogsLdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585324303; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tiChb4LP51sT/zwzAWo538sSYHeyiRRAXQEulNf1yEY=; b=RavAo2WlvcJimT2hSPgm4K8JiOC0IvTLZEEbyMPuPPPs6ZhSSGOYS8h/l4DZgsSyRjBm+6RMaJ0NK95Q2uqJBmavqTxL4Osphv4bizhR94arYKV3091hBh44cuhnEb1z933/8xgjT7dLvZCDJAwna3gJRKwq6nbNTA0EjjMPYE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585324303917509.0844771046799; Fri, 27 Mar 2020 08:51:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-12-DCxtkvbANRqLbR0W8_ohWQ-1; Fri, 27 Mar 2020 11:51:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33DDD108444B; Fri, 27 Mar 2020 15:51:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D30F2A0A60; Fri, 27 Mar 2020 15:51:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD89318089CF; Fri, 27 Mar 2020 15:51:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RFpSH4011127 for ; Fri, 27 Mar 2020 11:51:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2BD5B5C557; Fri, 27 Mar 2020 15:51:28 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 797A11D3 for ; Fri, 27 Mar 2020 15:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585324302; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tiChb4LP51sT/zwzAWo538sSYHeyiRRAXQEulNf1yEY=; b=KqWJnH8f1VX3Fcu07Bi39LWbnZy2lETw2smU06sG2v7nF8+SmsRPOCTR4q9hxrMdv0Ft2C krDRKL9JmtazWyZqKR3Kd0wBGk385xUDEWIQIAPW+Xue8I6zD84Yl6nwp5OtQ20Vt+c+qm j7R7t2EYJJmdP3qKrdNdtRkbrSuvUxg= X-MC-Unique: DCxtkvbANRqLbR0W8_ohWQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] virStorageSourceParseBackingURI: Preserve query parts of URI Date: Fri, 27 Mar 2020 16:51:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" For non-NBD URIs we need to preserve the query part as it may be important to refer to the image. If the query doesn't start with 'socket=3D' concatenate it to the name of the image. Signed-off-by: Peter Krempa --- src/util/virstoragefile.c | 15 +++++++++++---- tests/virstoragetest.c | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c43e52d1f6..caf5de2d2c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2818,6 +2818,7 @@ virStorageSourceParseBackingURI(virStorageSourcePtr s= rc, { g_autoptr(virURI) uri =3D NULL; const char *path =3D NULL; + g_autofree char *pathquery =3D NULL; VIR_AUTOSTRINGLIST scheme =3D NULL; if (!(uri =3D virURIParse(uristr))) { @@ -2851,10 +2852,6 @@ virStorageSourceParseBackingURI(virStorageSourcePtr = src, return -1; } - /* handle socket stored as a query */ - if (uri->query) - src->hosts->socket =3D g_strdup(STRSKIP(uri->query, "socket=3D")); - /* uri->path is NULL if the URI does not contain slash after host: * transport://host:port */ if (uri->path) @@ -2862,6 +2859,16 @@ virStorageSourceParseBackingURI(virStorageSourcePtr = src, else path =3D ""; + /* handle socket stored as a query */ + if (uri->query) { + if (STRPREFIX(uri->query, "socket=3D")) { + src->hosts->socket =3D g_strdup(STRSKIP(uri->query, "socket=3D= ")); + } else { + pathquery =3D g_strdup_printf("%s?%s", path, uri->query); + path =3D pathquery; + } + } + /* possibly skip the leading slash */ if (path[0] =3D=3D '/') path++; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 10d5421150..f0bb46a04c 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -1632,7 +1632,7 @@ mymain(void) "\"file.url\": \"https://host/folder/es= x6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=3Ddata&dsNam= e=3Desx6.5-matrix\"," "\"file.timeout\": 2000" "}", - "\n" + "\n" " \n" " \n" " \n" @@ -1647,7 +1647,7 @@ mymain(void) "\"file.url\": \"https://host/folder/es= x6.5-rhel7.7-x86%5f64/esx6.5-rhel7.7-x86%5f64-flat.vmdk?dcPath=3Ddata&dsNam= e=3Desx6.5-matrix\"," "\"file.timeout\": 2000" "}", - "\n" + "\n" " \n" " \n" " \n" --=20 2.24.1 From nobody Wed May 1 14:16:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585324329; cv=none; d=zohomail.com; s=zohoarc; b=bTRCB+DVAsaiAf0K9CZ1B++1ibUCmswtmTYfoHeGcDJMheETdrW/NST8p/MIxN+ESolkwsypBh3k8La4XTVbF4HO9c/YqbQm3ZfKdhy30irA8a59sqPJG7ODLhDlNhIeehQtvtLOmmUGSAGnAkH22Ur7fKO4FqQAW8flc3OcFyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585324329; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fq28j2+6kC9kv91pFrW1qFi6LX2laAm1r4ev4iBN4u0=; b=Tw6NxhC8pB36Vha6ozdcGCgg68w3bdzuZQzIQ/8HyWezbOpXYDf1MwPpB6O+Y2ZSgrQMNsDCpU/lwB7vS9GjxAiEkkNr2q0NHBCaEat+o7yEsH98IpoJBNdsIMDnJKAZGdAWGTzo9FW1bikfHOZXqrRMoKPeravqW61FMljKrfU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585324329842924.9805291939335; Fri, 27 Mar 2020 08:52:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-TeuRL_uUPuagMbVGgKBJAw-1; Fri, 27 Mar 2020 11:52:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC392107B11B; Fri, 27 Mar 2020 15:51:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E3EE10016DA; Fri, 27 Mar 2020 15:51:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2A27918089D7; Fri, 27 Mar 2020 15:51:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RFpeki011145 for ; Fri, 27 Mar 2020 11:51:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF1F85F709; Fri, 27 Mar 2020 15:51:40 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1300F66850 for ; Fri, 27 Mar 2020 15:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585324328; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Fq28j2+6kC9kv91pFrW1qFi6LX2laAm1r4ev4iBN4u0=; b=NkTpL91urswdvycjJC2L+e/b4GGM9gaQcGBHyKTVv6X8UleOWB3wpio5pppopbZ0gvNcTW hTqkrPa/axmXcnbQnlrDqG44/h5cBYeZugG++XbmTuUaFJORu0/yrZBDgol/pU9He+dOZB yTt9y11CnNt6kuaa509JOJesGWojxHk= X-MC-Unique: TeuRL_uUPuagMbVGgKBJAw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemuBlockStorageSourceGetURI: Properly preserve query component Date: Fri, 27 Mar 2020 16:51:20 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Look for the questionmark in the name and move the contents into the query portion so that we format the URI back properly. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 648c3f1026..c51fb2b6ea 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -429,12 +429,18 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) } if (src->path) { + char *query; if (src->volume) { uri->path =3D g_strdup_printf("/%s/%s", src->volume, src->path= ); } else { uri->path =3D g_strdup_printf("%s%s", src->path[0] =3D=3D '/' = ? "" : "/", src->path); } + + if ((query =3D strchr(uri->path, '?'))) { + uri->query =3D g_strdup(query + 1); + *query =3D '\0'; + } } uri->server =3D g_strdup(src->hosts->name); --=20 2.24.1 From nobody Wed May 1 14:16:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585324338; cv=none; d=zohomail.com; s=zohoarc; b=bQRG5jMnJL49G7hQJbZwPYJVVZWN4zuZQdWRzuEWvVk7/O1izIDUl/ocbpDCa86lmohYaZzZLXcbY16FOMLo7tg2fH4J2FRS/DFrQfnO8TOmFM56E7j/D7rDeBb3NgWtKlQ1hgo5H5nGXSi8Q/0c0rJzlt8+eXsskS6TCInGe0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585324338; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h51NnGsIQocg3Fm6qVIA0zsUIvON/zgZVvvndCZvnJk=; b=mabKqybk0S/+x45XsPc0I9hQ4JvjR6Rngbf9AwM8VgdzBXYL2S2VH7+pJi01+0gxCG6RBWZbjhodYF7ECeOjGFPbxjDJDWEo1P9PRWsFz4wTp4QMPZXDcOdrqiq3aIE5ODRVxHns5CshTKZsx8GHF130HZ79hm71f9j7Yschins= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585324338755943.1475502051388; Fri, 27 Mar 2020 08:52:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-UxOL06deO6GgOwtXNmOXTA-1; Fri, 27 Mar 2020 11:52:13 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F178D86A067; Fri, 27 Mar 2020 15:52:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 41C4210027A4; Fri, 27 Mar 2020 15:52:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B10528A059; Fri, 27 Mar 2020 15:52:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02RFppDA011156 for ; Fri, 27 Mar 2020 11:51:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 582E163148; Fri, 27 Mar 2020 15:51:50 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47163177F7 for ; Fri, 27 Mar 2020 15:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585324337; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=h51NnGsIQocg3Fm6qVIA0zsUIvON/zgZVvvndCZvnJk=; b=Z16ZOCPJtGicM8mKCgmCp+wq/AhQFg3TPairZLLITqzabHwTfDBE+ywHbZz5qzV58IF6X2 81/rOL3CC6iiNszmQw0OQDL+ev6GwBeTZtunfog+QHmSzAe+f3PndoWz2BkUsje5ITuXNq cXgqP+18ZzrsiieRtRhUf0ofDcLxxNw= X-MC-Unique: UxOL06deO6GgOwtXNmOXTA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] qemuxml2argv: Test the query portion for HTTP disks Date: Fri, 27 Mar 2020 16:51:21 +0100 Message-Id: <5c7b3bbf001b9b9f249fc009a4f6c3e3c2853109.1585324237.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add a simple test case for preserving the query portion of http disk's path. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args | 5 +++-- tests/qemuxml2argvdata/disk-network-http.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index ed44424dc3..7b4674a588 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -55,8 +55,9 @@ id=3Dvirtio-disk2 \ -object secret,id=3Dlibvirt-1-storage-httpcookie-secret0,\ data=3DDrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --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=3Dval&other=3Dble","sslverif= y":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"}' \ diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxml2a= rgvdata/disk-network-http.xml index 93e6617433..3bcff14b95 100644 --- a/tests/qemuxml2argvdata/disk-network-http.xml +++ b/tests/qemuxml2argvdata/disk-network-http.xml @@ -42,7 +42,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b= /tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml index cf36331286..b925f45e28 100644 --- a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml @@ -49,7 +49,7 @@ - + --=20 2.24.1