From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653713298807.6221628611606; Fri, 11 Oct 2024 06:35:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 32ACE135F; Fri, 11 Oct 2024 09:35:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B679512E4; Fri, 11 Oct 2024 09:33:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0122D124F; Fri, 11 Oct 2024 09:33:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5CD2F1210 for ; Fri, 11 Oct 2024 09:33:10 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-199-ejD3AnJKNe6JKCUq1nUGUg-1; Fri, 11 Oct 2024 09:33:08 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9AC65195608B for ; Fri, 11 Oct 2024 13:33:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7827919560AA for ; Fri, 11 Oct 2024 13:33:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,WEIRD_PORT autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653590; h=from:from: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; bh=Mp36aH8I/xFbIXAXmg0XOcxo/Sv9SdeXRvgHBT2rrNM=; b=GyFtsmTYkwbplh2/gsjCYyfE0PjPyPsi6LtleuOnx5BsEDeNZ/OCBBCkPdkBCfosIUY9uo Bb3ZENlo87dLrGl26BXRkGif2tY8rpOy3d+MfaaQXebt2pMdLJR5+yUAKZPZBI2V0Wtc/l btMDy2drmQvlsgnXe861/1Kv357zJt0= X-MC-Unique: ejD3AnJKNe6JKCUq1nUGUg-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemublocktest: Convert all 'gluster' instances to 'nbd' in 'xml2json' cases Date: Fri, 11 Oct 2024 15:32:54 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CZGTEYZZXNBYLZB37WTSGRYLL245X73Q X-Message-ID-Hash: CZGTEYZZXNBYLZB37WTSGRYLL245X73Q X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653713933116600 Content-Type: text/plain; charset="utf-8" Gluster will be deprecated in the upcoming qemu version thus we need to replace the network protocol by something which will stay supported so that we can keep the tests around. Convert all cases referencing 'gluster' to 'nbd'. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- ...le-backing_basic-aio_io_uring-srconly.json | 19 ++++++++----------- .../file-backing_basic-aio_io_uring.json | 17 +++++++---------- .../file-backing_basic-aio_io_uring.xml | 2 +- ...ile-backing_basic-aio_threads-srconly.json | 19 ++++++++----------- .../file-backing_basic-aio_threads.json | 17 +++++++---------- .../file-backing_basic-aio_threads.xml | 2 +- ...acking_basic-cache-directsync-srconly.json | 19 ++++++++----------- .../file-backing_basic-cache-directsync.json | 17 +++++++---------- .../file-backing_basic-cache-directsync.xml | 2 +- ...file-backing_basic-cache-none-srconly.json | 19 ++++++++----------- .../file-backing_basic-cache-none.json | 17 +++++++---------- .../file-backing_basic-cache-none.xml | 2 +- ...le-backing_basic-cache-unsafe-srconly.json | 19 ++++++++----------- .../file-backing_basic-cache-unsafe.json | 17 +++++++---------- .../file-backing_basic-cache-unsafe.xml | 2 +- ...backing_basic-cache-writeback-srconly.json | 19 ++++++++----------- .../file-backing_basic-cache-writeback.json | 17 +++++++---------- .../file-backing_basic-cache-writeback.xml | 2 +- ...king_basic-cache-writethrough-srconly.json | 19 ++++++++----------- ...file-backing_basic-cache-writethrough.json | 17 +++++++---------- .../file-backing_basic-cache-writethrough.xml | 2 +- .../file-backing_basic-detect-srconly.json | 19 ++++++++----------- .../xml2json/file-backing_basic-detect.json | 17 +++++++---------- .../xml2json/file-backing_basic-detect.xml | 2 +- ...le-backing_basic-unmap-detect-srconly.json | 19 ++++++++----------- .../file-backing_basic-unmap-detect.json | 17 +++++++---------- .../file-backing_basic-unmap-detect.xml | 2 +- ...le-backing_basic-unmap-ignore-srconly.json | 19 ++++++++----------- .../file-backing_basic-unmap-ignore.json | 17 +++++++---------- .../file-backing_basic-unmap-ignore.xml | 2 +- .../file-backing_basic-unmap-srconly.json | 19 ++++++++----------- .../xml2json/file-backing_basic-unmap.json | 17 +++++++---------- .../xml2json/file-backing_basic-unmap.xml | 2 +- 33 files changed, 176 insertions(+), 242 deletions(-) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uri= ng-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_i= o_uring-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring-srco= nly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uri= ng.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.= json index f510c43edb..b32e2181dc 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.json @@ -36,16 +36,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uri= ng.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.x= ml index 610c091f3e..b5a868113b 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_io_uring.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_thread= s-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_th= reads-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srcon= ly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads-srcon= ly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_thread= s.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.js= on index e77421d372..62189e7ea4 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json @@ -36,16 +36,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_thread= s.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml index ad84fab720..dc8ace1b8a 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-c= ache-directsync-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-= srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync-= srconly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dir= ectsync.json index 7a8d0686f6..caf8928d37 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= json @@ -54,16 +54,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync.xml index cf4197ea86..d776061364 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none= -srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-n= one-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconl= y.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none-srconl= y.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none= .json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json index 7a8d0686f6..caf8928d37 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json @@ -54,16 +54,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none= .xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml index 240afa85d2..308f020888 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsa= fe-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache= -unsafe-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe-srco= nly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsa= fe.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.= json index 15c8293f63..58a83ad7cf 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json @@ -54,16 +54,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsa= fe.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.x= ml index e18d33ce3c..cfc5225acb 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-ca= che-writeback-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-s= rconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback-s= rconly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback.json index 5918eed73f..5124b0328c 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.j= son +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.j= son @@ -54,16 +54,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-write= back.xml index 7040388040..407efe4b38 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.x= ml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.x= ml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= ethrough-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic= -cache-writethrough-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h-srconly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= ethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-w= ritethrough.json index 5918eed73f..5124b0328c 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.json @@ -54,16 +54,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= ethrough.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-wr= itethrough.xml index d2fe1b780b..0b60a4987a 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-src= only.json b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srco= nly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.js= on +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect-srconly.js= on @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.jso= n b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json index 6be2df9d1d..c27233269b 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json @@ -35,16 +35,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml= b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml index eaf89d316a..5502f7d612 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-dete= ct-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap= -detect-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect-srco= nly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-dete= ct.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.= json index 27e6e5ab60..1ec0b8fffc 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json @@ -38,16 +38,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-dete= ct.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.x= ml index 4638a78541..d783f8c583 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-igno= re-srconly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap= -ignore-srconly.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srco= nly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore-srco= nly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-igno= re.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.= json index 63c5cd2799..315a17323a 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json @@ -38,16 +38,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-igno= re.xml b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.x= ml index b2d599fc6c..760440d16c 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srco= nly.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconl= y.json index 65a3773b97..8549314e92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-srconly.json @@ -19,19 +19,16 @@ ( source only properties: { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ] + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c" } backing store string: - gluster://test.org:24007/images/c + nbd://test.org:10809/images/c ) ( source only properties: diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json= b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json index ac952c8acd..8557d4de92 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json @@ -37,16 +37,13 @@ "backing": "node-d-f" } { - "driver": "gluster", - "volume": "images", - "path": "c", - "server": [ - { - "type": "inet", - "host": "test.org", - "port": "24007" - } - ], + "driver": "nbd", + "server": { + "type": "inet", + "host": "test.org", + "port": "10809" + }, + "export": "images/c", "node-name": "node-c-s", "auto-read-only": true, "discard": "unmap" diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml = b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml index 68484991c1..666b87b94f 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml @@ -20,7 +20,7 @@ - + --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653645361638.1534265870793; Fri, 11 Oct 2024 06:34:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4D4FB1763; Fri, 11 Oct 2024 09:34:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D353314A0; Fri, 11 Oct 2024 09:33:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DF4C81283; Fri, 11 Oct 2024 09:33:11 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6A45E124F for ; Fri, 11 Oct 2024 09:33:11 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-GqC3wnk4Oxe1wcgHZerAaQ-1; Fri, 11 Oct 2024 09:33:09 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03074195608C for ; Fri, 11 Oct 2024 13:33:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D72B19560AA for ; Fri, 11 Oct 2024 13:33:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653591; h=from:from: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; bh=/+bFfRHHXmdMySjhKyDIAgJ9rdTkHzM6Lv87QkOKKDQ=; b=D44lgDwf6R97XtfexuqK7f+vFv/rv/MDoES2wIhgcGVJSBNUw9JTUY1VxZxc9Pk1DD87KW ECnpZo9/KoEf7TTR9tu1f4jILqFQe7wdPkeNBN84wLRvH2yyI5YuopbwrdqNI/2OCegVR7 dXx8J+pJkq9vPPVYoefE6LYdUpvxaB4= X-MC-Unique: GqC3wnk4Oxe1wcgHZerAaQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 02/10] qemublocktest: Mark gluster cases in XML->json->XML tests as deprecated Date: Fri, 11 Oct 2024 15:32:55 +0200 Message-ID: <54ea523cae6dfc3e5c1a3c4c92f5f1afebe67500.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DPESM7P3ZNRXCIFZPLOWZ6JNO3FUAATX X-Message-ID-Hash: DPESM7P3ZNRXCIFZPLOWZ6JNO3FUAATX X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653647348116600 Content-Type: text/plain; charset="utf-8" The gluster protocol backend will be deprecated as of qemu-9.2. Allow it for now in the QMP schema validator and mark them to be dropped once gluster is removed. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/qemublocktest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 60ac929e68..f8e9b73c6a 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -39,7 +39,7 @@ VIR_LOG_INIT("tests.storagetest"); struct testBackingXMLjsonXMLdata { int type; const char *xml; - bool legacy; + bool deprecated; GHashTable *schema; virJSONValue *schemaroot; }; @@ -80,7 +80,7 @@ testBackingXMLjsonXML(const void *args) } if (testQEMUSchemaValidate(backendprops, data->schemaroot, - data->schema, false, &debug) < 0) { + data->schema, data->deprecated, &debug) < 0= ) { g_autofree char *debugmsg =3D virBufferContentAndReset(&debug); g_autofree char *debugprops =3D virJSONValueToString(backendprops,= true); @@ -1053,6 +1053,8 @@ mymain(void) " \n" " \n" "\n"); + /* 'gluster' is deprecated as of qemu-9.2, once removed this tests can= be dropped too */ + xmljsonxmldata.deprecated =3D true; TEST_JSON_FORMAT_NET("\= n" " \n" "\n"); @@ -1061,6 +1063,7 @@ mymain(void) " \n" " \n" "\n"); + xmljsonxmldata.deprecated =3D false; TEST_JSON_FORMAT_NET("\n" " \n" "\n"); --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653756744789.201305722973; Fri, 11 Oct 2024 06:35:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A7D9C1446; Fri, 11 Oct 2024 09:35:55 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 532C016D3; Fri, 11 Oct 2024 09:33:29 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3AF021380; Fri, 11 Oct 2024 09:33:25 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BBDE713D3 for ; Fri, 11 Oct 2024 09:33:12 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-oxO41ySXOuG14KoybAcN5w-1; Fri, 11 Oct 2024 09:33:11 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 56F7C1956096 for ; Fri, 11 Oct 2024 13:33:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7713A19560AA for ; Fri, 11 Oct 2024 13:33:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653592; h=from:from: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; bh=5UcazoJLYkTsyqNbWWi8Dy9jJyDcwyr05BrIa2CKlhk=; b=IRbsdHR/8DixJOavDkGUFHt3XrLgeyRh2x4/FfLWZpb6SnVMXCg/LPEYg+FmLNwVtdRCy1 uNIptqodki/1UjUEamkywtM2GcOVVmOWG4Cv23HVQz7/BkVzWAFAtqPMN2GXFcrJs+elU/ K8ONa65cfBgzYMQnWwM2pu3UOt5Yp4Y= X-MC-Unique: oxO41ySXOuG14KoybAcN5w-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/10] qemublocktest: Mark 'gluster' case in image creation test as deprecated Date: Fri, 11 Oct 2024 15:32:56 +0200 Message-ID: <81c56542a5b9b58ea5175754b50b29b281dca617.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MHHPI3JA2PU2KXFBSCI74J3B4L3CUWLY X-Message-ID-Hash: MHHPI3JA2PU2KXFBSCI74J3B4L3CUWLY X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653758093116600 Content-Type: text/plain; charset="utf-8" The gluster protocol backend will be deprecated as of qemu-9.2. Allow it for now in the QMP schema validator and mark them to be dropped once gluster is removed. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/qemublocktest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index f8e9b73c6a..7ffa445c37 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -455,6 +455,8 @@ struct testQemuImageCreateData { virJSONValue *schemaroot; virQEMUDriver *driver; virQEMUCaps *qemuCaps; + + bool deprecated; }; static const char *testQemuImageCreatePath =3D abs_srcdir "/qemublocktestd= ata/imagecreate/"; @@ -528,7 +530,7 @@ testQemuImageCreate(const void *opaque) return -1; if (testQEMUSchemaValidate(formatprops, data->schemaroot, data->sc= hema, - false, &debug) < 0) { + data->deprecated, &debug) < 0) { g_autofree char *debugmsg =3D virBufferContentAndReset(&debug); VIR_TEST_VERBOSE("blockdev-create format json does not conform= to QAPI schema"); VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output= :\n %s", @@ -543,7 +545,7 @@ testQemuImageCreate(const void *opaque) return -1; if (testQEMUSchemaValidate(protocolprops, data->schemaroot, data->= schema, - false, &debug) < 0) { + data->deprecated, &debug) < 0) { g_autofree char *debugmsg =3D virBufferContentAndReset(&debug); VIR_TEST_VERBOSE("blockdev-create protocol json does not confo= rm to QAPI schema"); VIR_TEST_DEBUG("json:\n%s\ndoes not match schema. Debug output= :\n %s", @@ -1209,7 +1211,10 @@ mymain(void) TEST_IMAGE_CREATE("qcow2-backing-raw-slice", "raw-slice"); TEST_IMAGE_CREATE("qcow2-backing-qcow2-slice", "qcow2-slice"); + /* 'gluster' is deprecated as of qemu-9.2, once removed this tests can= be dropped too */ + imagecreatedata.deprecated =3D true; TEST_IMAGE_CREATE("network-gluster-qcow2", NULL); + imagecreatedata.deprecated =3D false; TEST_IMAGE_CREATE("network-rbd-qcow2", NULL); TEST_IMAGE_CREATE("network-ssh-qcow2", NULL); --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653778737418.34282719285454; Fri, 11 Oct 2024 06:36:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9E8941474; Fri, 11 Oct 2024 09:36:17 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 874D412F6; Fri, 11 Oct 2024 09:33:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0154E12E5; Fri, 11 Oct 2024 09:33:31 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A2E841474 for ; Fri, 11 Oct 2024 09:33:13 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-5XM6WTbuMYmRP34ssunWkQ-1; Fri, 11 Oct 2024 09:33:12 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D56619560BD for ; Fri, 11 Oct 2024 13:33:11 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0E9E19560AA for ; Fri, 11 Oct 2024 13:33:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653593; h=from:from: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; bh=1/hDqXHclO43uumrvyUAezXBf6r4UQWYKOVj9PjvVYk=; b=XxtK62D6zSbjX+YGYzaY0Th4s3184F6obCvCTswSqFDkRIfxmqKn/d4qnciK0TYql5G0Iv nhdq4+l67gvmY9d6LZhDrX045FDckpLluXQPx+95lf4ZiKwOe15IT7rvYG5nqIGO6tzDeH 8RCziSOoWC62s75cVXFpl7AMuEyJ9kM= X-MC-Unique: 5XM6WTbuMYmRP34ssunWkQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/10] qemuxmlconftest: Use only 'nfs' protocol in 'disk-network-nfs' Date: Fri, 11 Oct 2024 15:32:57 +0200 Message-ID: <8dafe41eb04650105eb4cc0901378e0a37d56a93.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ISQC22TDRLF4VT5RK472QXXVRDBWYEI6 X-Message-ID-Hash: ISQC22TDRLF4VT5RK472QXXVRDBWYEI6 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653780055116600 Content-Type: text/plain; charset="utf-8" Convert one of the layers of the backing chain to 'nfs' to test if users don't set the identity. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml | 4 ++-- tests/qemuxmlconfdata/disk-network-nfs.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args index a32475eadf..62f56b146f 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on","seri= al":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ -blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"= path":"/backing/store/nfs","user":1234,"group":5678,"node-name":"libvirt-2-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":null}' \ --blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"= path":"/Volume2/Image","node-name":"libvirt-1-storage","auto-read-only":tru= e,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml b/tes= ts/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml index 19e269c531..b0fb80d7f1 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.xml @@ -29,8 +29,8 @@ - - + + diff --git a/tests/qemuxmlconfdata/disk-network-nfs.xml b/tests/qemuxmlconf= data/disk-network-nfs.xml index 328afbc46c..b7f0e26451 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.xml +++ b/tests/qemuxmlconfdata/disk-network-nfs.xml @@ -26,8 +26,8 @@ - - + + --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653897349342.4728925252823; Fri, 11 Oct 2024 06:38:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 45D241430; Fri, 11 Oct 2024 09:38:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5371A174F; Fri, 11 Oct 2024 09:33:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 29A6616C2; Fri, 11 Oct 2024 09:33:40 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 66DC8130F for ; Fri, 11 Oct 2024 09:33:20 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-nm8HFCylNXCePH1wKmIYgw-1; Fri, 11 Oct 2024 09:33:13 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC03E1956089 for ; Fri, 11 Oct 2024 13:33:12 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C3C019560AD for ; Fri, 11 Oct 2024 13:33:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653600; h=from:from: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; bh=jF/CQAnnuEHHVfP65cTnCw8btoRR2tDFwuSNt/iJp7A=; b=ghRs0NRkfVhmBZGDyzSw4lzX6Njw2GH0bwP3yKyQ7i4yFnfWCvJ487wp5DMi61ZpsRJNKh mzFN9ELIE34EukjonSebT8Calr9XkGok2gdNB0Ngtqm9ICAjLg5bk4GMC+oY/EEuSASH9A 6PXkvQEL5GNT9ZzEWSSZyRUEjED+G2g= X-MC-Unique: nm8HFCylNXCePH1wKmIYgw-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 05/10] qemuxml(conf|active)test: Use 'nbd' instead of 'gluster' in 'disk-backing-chains-(no)index' cases Date: Fri, 11 Oct 2024 15:32:58 +0200 Message-ID: <22ef85b60e6bc49787380725a739184e71f1b2b2.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3U3GQTE7CAZIYN4MOY5INMWPFPLJJBCE X-Message-ID-Hash: 3U3GQTE7CAZIYN4MOY5INMWPFPLJJBCE X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653898756116600 Content-Type: text/plain; charset="utf-8" The gluster protocol will be deprecated by qemu-9.2. Convert the tests to NBD as it's trivial and the test cases are not concerned with a specific protocol. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- .../disk-backing-chains-index-active.x86_64-latest.xml | 4 ++-- .../disk-backing-chains-index-inactive.x86_64-latest.xml | 4 ++-- .../disk-backing-chains-index.x86_64-latest.xml | 4 ++-- tests/qemuxmlconfdata/disk-backing-chains-index.xml | 4 ++-- .../disk-backing-chains-noindex.x86_64-latest.args | 4 ++-- .../disk-backing-chains-noindex.x86_64-latest.xml | 4 ++-- tests/qemuxmlconfdata/disk-backing-chains-noindex.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x= 86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-ac= tive.x86_64-latest.xml index fec48e863b..5134818243 100644 --- a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-l= atest.xml +++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-active.x86_64-l= atest.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -68,7 +68,7 @@ - + diff --git a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive= .x86_64-latest.xml b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-= inactive.x86_64-latest.xml index 52c8ad6f29..ef4fa48366 100644 --- a/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64= -latest.xml +++ b/tests/qemuxmlactive2xmldata/disk-backing-chains-index-inactive.x86_64= -latest.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -68,7 +68,7 @@ - + diff --git a/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.= xml b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml index ad81cd4696..7d9405b6a8 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -68,7 +68,7 @@ - + diff --git a/tests/qemuxmlconfdata/disk-backing-chains-index.xml b/tests/qe= muxmlconfdata/disk-backing-chains-index.xml index 90da6a97e9..bf2104b477 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-index.xml +++ b/tests/qemuxmlconfdata/disk-backing-chains-index.xml @@ -16,7 +16,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -65,7 +65,7 @@ - + diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-lates= t.args b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.ar= gs index 59b7843796..a5c71cc146 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow","= node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qco= w2","file":"libvirt-25-storage"}' \ --blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-24-= storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"nbd","server":{"type":"unix","path":"/path/to/sock"}= ,"export":"Volume2/Image","node-name":"libvirt-24-storage","auto-read-only"= :true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qc= ow2","file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-24-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ","node-name":"libvirt-23-storage","read-only":true}' \ @@ -46,7 +46,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,"= discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qc= ow2","file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-17-format","id":"virtio-disk1"}' \ --blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-16-storage","read-only":false}' \ +-blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"Volume1/Image","node-name":"libvirt-16-storage","rea= d-only":false}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-16-storage","id":"virtio-disk2"}' \ -blockdev '{"driver":"file","filename":"/tmp/image.qcow","node-name":"libv= irt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qco= w2","file":"libvirt-15-storage","backing":null}' \ diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-lates= t.xml b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml index ad81cd4696..7d9405b6a8 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -68,7 +68,7 @@ - + diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml b/tests/= qemuxmlconfdata/disk-backing-chains-noindex.xml index dc928f7075..375882486d 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml +++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml @@ -16,7 +16,7 @@ /usr/bin/qemu-system-x86_64 - + @@ -65,7 +65,7 @@ - + --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653802982492.99850052459044; Fri, 11 Oct 2024 06:36:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DB2B5145D; Fri, 11 Oct 2024 09:36:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1909612AA; Fri, 11 Oct 2024 09:33:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C70DE166D; Fri, 11 Oct 2024 09:33:32 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A177915AB for ; Fri, 11 Oct 2024 09:33:16 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-76-2lxowKlIONeuhcBwxJl3MQ-1; Fri, 11 Oct 2024 09:33:15 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A9131955EA7 for ; Fri, 11 Oct 2024 13:33:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5F3F619560AD for ; Fri, 11 Oct 2024 13:33:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653596; h=from:from: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; bh=TQl2FQ853PEDaj+l4YMkFmoU0e8uDx1Sy3LS7VsF/yY=; b=PQC5zfloH4+LY/4v6zs0F+QsV2mMObUEN494KzN+Co3FvHAUNDiyervQm1k1lFEqTE+FRs BmBJJfDm75SKDxQH3NWN8KuM0t0ulIRj0NKsC2ZqJzq02Zk2LoFSESpJwebJ5dVI4+p/u9 XMdgtNYCI3bI8klzhPlC5oy76dD41lQ= X-MC-Unique: 2lxowKlIONeuhcBwxJl3MQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 06/10] qemuxmlconftest: Pin 'disk-network-gluster' case to qemu-9.1 Date: Fri, 11 Oct 2024 15:32:59 +0200 Message-ID: <7e21496f7ee111b820fb590d069ebf57ed7250b5.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: F5BH7OSUZISIZZGAN6CCWPEJP4FD2KOQ X-Message-ID-Hash: F5BH7OSUZISIZZGAN6CCWPEJP4FD2KOQ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653804195116600 Content-Type: text/plain; charset="utf-8" The gluster protocol was deprecated in qemu-9.2. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- ...6_64-latest.args =3D> disk-network-gluster.x86_64-9.1.0.args} | 2 +- ...x86_64-latest.xml =3D> disk-network-gluster.x86_64-9.1.0.xml} | 2 +- tests/qemuxmlconfdata/disk-network-gluster.xml | 2 +- tests/qemuxmlconftest.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.args =3D>= disk-network-gluster.x86_64-9.1.0.args} (96%) rename tests/qemuxmlconfdata/{disk-network-gluster.x86_64-latest.xml =3D> = disk-network-gluster.x86_64-9.1.0.xml} (97%) diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args = b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args similarity index 96% rename from tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args index 786917ef88..7cf4c4404b 100644 --- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-machine pc-i440fx-9.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D219136k \ diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml b= /tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml similarity index 97% rename from tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml index 3213a6d7c4..9195e67bf5 100644 --- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/disk-network-gluster.xml b/tests/qemuxml= confdata/disk-network-gluster.xml index 2ff28ad3a0..a6679fcc89 100644 --- a/tests/qemuxmlconfdata/disk-network-gluster.xml +++ b/tests/qemuxmlconfdata/disk-network-gluster.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index dfcf67d2d0..91daf955f5 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1576,7 +1576,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-in= valid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrett= ype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_LATEST("disk-network-gluster"); + /* 'gluster' protocol backend was deprecated in qemu-9.2 */ + DO_TEST_CAPS_VER("disk-network-gluster", "9.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653826590179.43374487395135; Fri, 11 Oct 2024 06:37:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7F0A4166D; Fri, 11 Oct 2024 09:37:05 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D72951722; Fri, 11 Oct 2024 09:33:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7E0B4136D; Fri, 11 Oct 2024 09:33:34 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B40141277 for ; Fri, 11 Oct 2024 09:33:17 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-CAYo0rjUOsqISg2fGoLRKA-1; Fri, 11 Oct 2024 09:33:16 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7AAB819560B2 for ; Fri, 11 Oct 2024 13:33:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A6BEF19560AA for ; Fri, 11 Oct 2024 13:33:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653597; h=from:from: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; bh=popPpZpsKoHrAuDvmIIkirTg8KK+SLefTqteaXUPSM4=; b=Zel1UhduQAH/hmhL8aIF8EcV2Z7p3JMMZFSu3rGUhL67+enX48BoOSZ0XQ9+q6AYRKH9te oqEiF/Dqr51MVUF1qydvPYT2009bzwva5xWE/zHCXKvggWscS4omIoiEDlqGKR04hpfUmy I/TQ5Ee7TxQSrjJuiGKlygxtuXjcM9M= X-MC-Unique: CAYo0rjUOsqISg2fGoLRKA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/10] qemu: capabilities: Introduce QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS Date: Fri, 11 Oct 2024 15:33:00 +0200 Message-ID: <9a7a876c14da0871b07da18df561b613a9304202.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FMXK4KG6HDBJLU5T2GZLYBJRPC5CDCIC X-Message-ID-Hash: FMXK4KG6HDBJLU5T2GZLYBJRPC5CDCIC X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653828374116600 Content-Type: text/plain; charset="utf-8" New qemu introduced the 'reconnect-ms' field for character devices allowing the reconnect timeout to be specified in milliseconds, which also deprecates the existing 'reconnect' field that libvirt uses. To avoid use of deprecated interfaces add a capability which will allow us to use the new field. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ac135aa301..7d0cb2caaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -718,6 +718,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 465 */ "snapshot-internal-qmp", /* QEMU_CAPS_SNAPSHOT_INTERNAL_QMP = */ + "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONN= ECT_MILISECONDS */ ); @@ -1559,6 +1560,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "blockdev-add/arg-type/+virtio-blk-vhost-vdpa/$fdset", QEMU_CAPS_DEV= ICE_VIRTIO_BLK_VHOST_VDPA}, { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SN= APSHOT_ALLOW_WRITE_ONLY }, { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHA= RDEV_RECONNECT }, + { "chardev-add/arg-type/backend/+socket/data/reconnect-ms", QEMU_CAPS_= CHARDEV_RECONNECT_MILISECONDS }, { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON }, { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transf= orm", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 091de8999d..284b07b64e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -697,6 +697,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 465 */ QEMU_CAPS_SNAPSHOT_INTERNAL_QMP, /* internal snapshot support via QMP = commands 'snapshot-save'/'snapshot-delete' */ + QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for = chardevs supported */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728653860697876.2949016622599; Fri, 11 Oct 2024 06:37:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 89C9D12D7; Fri, 11 Oct 2024 09:37:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 80CAB1738; Fri, 11 Oct 2024 09:33:45 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id CC70813BA; Fri, 11 Oct 2024 09:33:39 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0DA851321 for ; Fri, 11 Oct 2024 09:33:19 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-hDHiIn4ePny6TH7ipJxh9g-1; Fri, 11 Oct 2024 09:33:17 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C570619560BC for ; Fri, 11 Oct 2024 13:33:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0683A19560AD for ; Fri, 11 Oct 2024 13:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653598; h=from:from: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; bh=pVG8FUAwMJEOR4OQfc6iiErV5eZPnz/JdMVJFVFbOxg=; b=PC0LLXOENqAYNdB1ZggHeEOqpaIAkdy3lVWs/K6ttIDPu2lRE+egPH2SZaBkqO3dD4OAdi f/CsEkxfV5SyfWZTfbjDOKEyuBMEFHuslVSe/M9FXVilpPs+e39zNiXXtS5XaFZcPzJvEZ sBRP7foyVgExa3PqeeSJXj4IM8no57w= X-MC-Unique: hDHiIn4ePny6TH7ipJxh9g-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemu: chardev: Use 'reconnect-ms' instead of deprecated 'reconnect' Date: Fri, 11 Oct 2024 15:33:01 +0200 Message-ID: <165038e4e47165b1d50a8e73057c94f3dd851d4c.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E2LHD6SSMAOJV7NSMOGXRBJVVVCFQNZG X-Message-ID-Hash: E2LHD6SSMAOJV7NSMOGXRBJVVVCFQNZG X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653862403116600 Content-Type: text/plain; charset="utf-8" qemu-9.2 will deprecate the 'reconnect' field in favor of 'reconnect-ms'. As libvirt currently doesn't track the timeouts in milliseconds we simply convert them to avoid use of the deprecated field. Quite a lot of churn is caused by the need to plumb 'qemuCaps' into the chardev props generator. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_block.h | 1 + src/qemu/qemu_chardev.c | 20 +++++++++++++++++++- src/qemu/qemu_chardev.h | 1 + src/qemu/qemu_command.c | 12 ++++++++---- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_hotplug.c | 19 ++++++++++--------- tests/qemumonitorjsontest.c | 2 +- 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index e739c097ca..692b4d350e 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1685,7 +1685,7 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon, if (data->chardevDef) { g_autoptr(virJSONValue) props =3D NULL; - if (qemuChardevGetBackendProps(data->chardevDef, false, + if (qemuChardevGetBackendProps(data->chardevDef, false, data->qemu= Caps, data->chardevAlias, NULL, &props) <= 0) return -1; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index f9e961d85d..f13a4a4a9a 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -105,6 +105,7 @@ struct qemuBlockStorageSourceAttachData { char *driveCmd; + virQEMUCaps *qemuCaps; /* borrowed from VM, valid only for chardev-bac= ked source */ virDomainChrSourceDef *chardevDef; char *chardevAlias; bool chardevAdded; diff --git a/src/qemu/qemu_chardev.c b/src/qemu/qemu_chardev.c index b3ed11233b..b6828b6752 100644 --- a/src/qemu/qemu_chardev.c +++ b/src/qemu/qemu_chardev.c @@ -143,6 +143,7 @@ qemuChardevBackendAddSocketAddressUNIX(virJSONValue **b= ackendData, int qemuChardevGetBackendProps(const virDomainChrSourceDef *chr, bool commandline, + virQEMUCaps *qemuCaps, const char *alias, const char **backendType, virJSONValue **props) @@ -213,6 +214,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, virTristateBool waitval =3D VIR_TRISTATE_BOOL_ABSENT; virTristateBool server =3D VIR_TRISTATE_BOOL_ABSENT; int reconnect =3D -1; + long long reconnect_ms =3D -1; *backendType =3D "socket"; @@ -243,10 +245,17 @@ qemuChardevGetBackendProps(const virDomainChrSourceDe= f *chr, reconnect =3D 0; } + if (reconnect !=3D -1 && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_RECONNECT_MILISECON= DS)) { + reconnect_ms =3D reconnect * 1000; + reconnect =3D -1; + } + if (virJSONValueObjectAdd(props, "T:server", server, "T:wait", waitval, "k:reconnect", reconnect, + "K:reconnect-ms", reconnect_ms, NULL) < 0) return -1; } @@ -257,6 +266,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, virTristateBool telnet =3D VIR_TRISTATE_BOOL_ABSENT; virTristateBool server =3D VIR_TRISTATE_BOOL_ABSENT; int reconnect =3D -1; + long long reconnect_ms =3D -1; *backendType =3D "socket"; @@ -280,6 +290,12 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef= *chr, else if (chr->data.tcp.reconnect.enabled =3D=3D VIR_TRISTATE_BOOL_= NO) reconnect =3D 0; + if (reconnect !=3D -1 && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_RECONNECT_MILISECON= DS)) { + reconnect_ms =3D reconnect * 1000; + reconnect =3D -1; + } + if (qemuChardevBackendAddSocketAddressInet(props, "addr", commandline, NULL, chr->data.tcp.host, @@ -291,6 +307,7 @@ qemuChardevGetBackendProps(const virDomainChrSourceDef = *chr, "T:server", server, "T:wait", waitval, "k:reconnect", reconnect, + "K:reconnect-ms", reconnect_ms, "S:tls-creds", chrSourcePriv->tlsCredsAl= ias, NULL) < 0) return -1; @@ -462,7 +479,8 @@ qemuChardevBuildCommandline(virCommand *cmd, bool useJSON =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_JSON); const char *backendType =3D NULL; - if (qemuChardevGetBackendProps(dev, !useJSON, charAlias, &backendType,= &props) < 0) + if (qemuChardevGetBackendProps(dev, !useJSON, qemuCaps, charAlias, + &backendType, &props) < 0) return -1; if (useJSON) { diff --git a/src/qemu/qemu_chardev.h b/src/qemu/qemu_chardev.h index 0381e0df65..59f258cbe3 100644 --- a/src/qemu/qemu_chardev.h +++ b/src/qemu/qemu_chardev.h @@ -17,6 +17,7 @@ qemuChardevBuildCommandline(virCommand *cmd, int qemuChardevGetBackendProps(const virDomainChrSourceDef *chr, bool commandline, + virQEMUCaps *qemuCaps, const char *alias, const char **backendType, virJSONValue **props); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b4888a5822..c7055ef196 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2027,7 +2027,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd, size_t i; if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev(dis= k))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev(dis= k, qemuCaps))) return -1; } else if (!qemuDiskBusIsSD(disk->bus)) { if (virStorageSourceIsEmpty(disk->src)) @@ -10824,18 +10824,21 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomai= nDiskDef *disk) /** * qemuBuildStorageSourceAttachPrepareChardev: * @src: disk source to prepare + * @qemuCaps: qemu capabilities object borrowed for chardev backend genera= tion * * Prepare qemuBlockStorageSourceAttachData *for vhost-user disk * to be used with -chardev. */ static qemuBlockStorageSourceAttachData * -qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk) +qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceAttachData, 1); data->chardevDef =3D disk->src->vhostuser; + data->qemuCaps =3D qemuCaps; data->chardevAlias =3D qemuDomainGetVhostUserChrAlias(disk->info.alias= ); return g_steal_pointer(&data); @@ -10937,14 +10940,15 @@ qemuBuildStorageSourceChainAttachPrepareDrive(vir= DomainDiskDef *disk) * disk's backend via -chardev. */ qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk) +qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps) { g_autoptr(qemuBlockStorageSourceAttachData) elem =3D NULL; g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; data =3D g_new0(qemuBlockStorageSourceChainData, 1); - if (!(elem =3D qemuBuildStorageSourceAttachPrepareChardev(disk))) + if (!(elem =3D qemuBuildStorageSourceAttachPrepareChardev(disk, qemuCa= ps))) return NULL; VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index dca8877703..309e566f6c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -106,7 +106,8 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomain= DiskDef *disk); qemuBlockStorageSourceChainData * -qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk); +qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDef *disk, + virQEMUCaps *qemuCaps); qemuBlockStorageSourceChainData * diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4d4bcde1bc..1a7b69e5bb 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -243,7 +243,8 @@ qemuDomainDetachExtensionDevice(qemuMonitor *mon, static int qemuHotplugChardevAttach(qemuMonitor *mon, const char *alias, - virDomainChrSourceDef *def) + virDomainChrSourceDef *def, + virQEMUCaps *qemuCaps) { g_autoptr(virJSONValue) props =3D NULL; g_autofree char *ptypath =3D NULL; @@ -277,7 +278,7 @@ qemuHotplugChardevAttach(qemuMonitor *mon, return -1; } - if (qemuChardevGetBackendProps(def, false, alias, NULL, &props) < 0) + if (qemuChardevGetBackendProps(def, false, qemuCaps, alias, NULL, &pro= ps) < 0) return -1; if (qemuMonitorAttachCharDev(mon, &props, &ptypath) < 0) @@ -719,7 +720,7 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, disk->src->readonly =3D true; if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TY= PE_VHOST_USER) { - if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev= (disk))) + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareChardev= (disk, priv->qemuCaps))) return -1; } else { if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockde= v(disk->src))) @@ -1370,7 +1371,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vh= ostuser) < 0) { + if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vh= ostuser, priv->qemuCaps) < 0) { qemuDomainObjExitMonitor(vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto cleanup; @@ -1846,7 +1847,7 @@ qemuDomainAttachRedirdevDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); - if (qemuHotplugChardevAttach(priv->mon, charAlias, redirdev->source) <= 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, redirdev->source, p= riv->qemuCaps) < 0) goto exit_monitor; chardevAdded =3D true; @@ -2115,7 +2116,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuFDPassDirectTransferMonitor(charpriv->directfd, priv->mon) < 0) goto exit_monitor; - if (qemuHotplugChardevAttach(priv->mon, charAlias, chr->source) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, chr->source, priv->= qemuCaps) < 0) goto exit_monitor; chardevAttached =3D true; @@ -2225,7 +2226,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && - qemuHotplugChardevAttach(priv->mon, charAlias, rng->source.chardev= ) < 0) + qemuHotplugChardevAttach(priv->mon, charAlias, rng->source.chardev= , priv->qemuCaps) < 0) goto exit_monitor; chardevAdded =3D true; @@ -2899,7 +2900,7 @@ qemuDomainAttachShmemDevice(virDomainObj *vm, qemuDomainObjEnterMonitor(vm); if (shmem->server.enabled) { - if (qemuHotplugChardevAttach(priv->mon, charAlias, shmem->server.c= hr) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, shmem->server.c= hr, priv->qemuCaps) < 0) goto exit_monitor; } else { if (qemuMonitorAddObject(priv->mon, &props, &memAlias) < 0) @@ -3296,7 +3297,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(vm); - if (qemuHotplugChardevAttach(priv->mon, charAlias, chardev) < 0) + if (qemuHotplugChardevAttach(priv->mon, charAlias, chardev, priv->qemu= Caps) < 0) goto exit_monitor; chardevAdded =3D true; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index fca4890746..f7fe0fb6f4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -578,7 +578,7 @@ testQemuMonitorJSONAttachChardev(const void *opaque) return -1; } - if (qemuChardevGetBackendProps(data->chr, false, "alias", NULL, &props= ) < 0) + if (qemuChardevGetBackendProps(data->chr, false, NULL, "alias", NULL, = &props) < 0) return -1; if ((rc =3D qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test), = &props, &ptypath)) < 0) --=20 2.46.2 From nobody Fri Jan 3 00:47:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17286539797821007.161174018151; Fri, 11 Oct 2024 06:39:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7C141116; Fri, 11 Oct 2024 09:39:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9153816E4; Fri, 11 Oct 2024 09:33:52 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AC62B175E; Fri, 11 Oct 2024 09:33:48 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C22B31366 for ; Fri, 11 Oct 2024 09:33:20 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-oxEGS1ZMM_Kad2hxXHkSmA-1; Fri, 11 Oct 2024 09:33:19 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 515A7195608B for ; Fri, 11 Oct 2024 13:33:18 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 484F619560AA for ; Fri, 11 Oct 2024 13:33:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728653600; h=from:from: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; bh=EZDyhmdkBaHcojyiITlBk8i+HZiGCf/CBkx9FvypIEI=; b=DA7nbxFFD/WclV/L8+fQFD727udePyEQbVZ5x9h2qr3jBtthxFZJTNuUMzWtCsEL2IBdGN aFSGcnNBPg06TfqGlVfG7AzozA+SbRggac2vIVxYCsB8zfM6hArucph8OAVuoIq45bPySx 3JmltThMeoAv6tXQ7Dg5gB3gX6j03vQ= X-MC-Unique: oxEGS1ZMM_Kad2hxXHkSmA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 09/10] qemuxmlconftest: Add '9.1.0' versions of test cases for 'reconnect' option of chardevs Date: Fri, 11 Oct 2024 15:33:02 +0200 Message-ID: <448b0017ca4be45cd16673838d8dd43623543c05.1728653516.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3PHNURV5TSOHQ7WWLSNAFNUVT6LIQGIV X-Message-ID-Hash: 3PHNURV5TSOHQ7WWLSNAFNUVT6LIQGIV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728653980974116600 Content-Type: text/plain; charset="utf-8" Upcoming qemu-9.2 will deprecate 'reconnect' in favor of 'reconnect-ms'. Add pinned versions so that we test also the old syntax. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- .../chardev-backends-json.x86_64-9.1.0.args | 79 ++++++++++ .../chardev-backends-json.x86_64-9.1.0.xml | 149 ++++++++++++++++++ .../chardev-backends.x86_64-9.1.0.args | 79 ++++++++++ .../chardev-backends.x86_64-9.1.0.xml | 149 ++++++++++++++++++ .../chardev-reconnect.x86_64-9.1.0.args | 46 ++++++ .../chardev-reconnect.x86_64-9.1.0.xml | 72 +++++++++ tests/qemuxmlconftest.c | 5 + 7 files changed, 579 insertions(+) create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.= 0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.= 0.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.ar= gs create mode 100644 tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.xml diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args = b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args new file mode 100644 index 0000000000..98929ab39f --- /dev/null +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args @@ -0,0 +1,79 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"= type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ +-chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"devi= ce":"/dev/parport0"}}}' \ +-device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ +-add-fd set=3D0,fd=3D1751,opaque=3Dchannel0-log \ +-chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":= "/dev/fdset/0","logappend":true}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ +-add-fd set=3D1,fd=3D1751,opaque=3Dchannel1-log \ +-chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/= dev/fdset/1","logappend":true}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ +-chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ +-chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ +-add-fd set=3D2,fd=3D1750,opaque=3Dchannel4-source \ +-chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/de= v/fdset/2","append":true}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ +-chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"= /path/to/pipe"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ +-chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device"= :"/path/to/device"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ +-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ +-chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{= "type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"recon= nect":2}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ +-chardev '{"id":"charchannel9","backend":{"type":"socket","data":{"addr":{= "type":"inet","data":{"host":"1.2.3.4","port":"5678"}},"telnet":false,"serv= er":true,"wait":false}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":10,"char= dev":"charchannel9","id":"channel9","name":"chardev-tcp-listen-raw"}' \ +-chardev '{"id":"charchannel10","backend":{"type":"socket","data":{"addr":= {"type":"inet","data":{"host":"1.2.3.4","port":"5679"}},"telnet":true,"serv= er":true,"wait":false}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":11,"char= dev":"charchannel10","id":"channel10","name":"chardev-tcp-listen-telnet"}' \ +-object '{"qom-type":"tls-creds-x509","id":"objcharchannel11_tls0","dir":"= /etc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ +-chardev '{"id":"charchannel11","backend":{"type":"socket","data":{"addr":= {"type":"inet","data":{"host":"1.2.3.4","port":"5678"}},"telnet":false,"ser= ver":false,"reconnect":2,"tls-creds":"objcharchannel11_tls0"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":12,"char= dev":"charchannel11","id":"channel11","name":"chardev-tcp-connect-raw"}' \ +-object '{"qom-type":"tls-creds-x509","id":"objcharchannel12_tls0","dir":"= /etc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ +-chardev '{"id":"charchannel12","backend":{"type":"socket","data":{"addr":= {"type":"inet","data":{"host":"hostname.global.","port":"5679"}},"telnet":t= rue,"server":false,"reconnect":2,"tls-creds":"objcharchannel12_tls0"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":13,"char= dev":"charchannel12","id":"channel12","name":"chardev-tcp-connect-telnet"}'= \ +-chardev '{"id":"charchannel13","backend":{"type":"udp","data":{"remote":{= "type":"inet","data":{"host":"127.0.0.1","port":"2222"}}}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":14,"char= dev":"charchannel13","id":"channel13","name":"chardev-udp-nobind"}' \ +-chardev '{"id":"charchannel14","backend":{"type":"udp","data":{"remote":{= "type":"inet","data":{"host":"127.0.0.1","port":"2222"}},"local":{"type":"i= net","data":{"host":"127.0.0.1","port":"1111"}}}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":15,"char= dev":"charchannel14","id":"channel14","name":"chardev-udp-bind"}' \ +-chardev '{"id":"charchannel15","backend":{"type":"spicevmc","data":{"type= ":"vdagent"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":16,"char= dev":"charchannel15","id":"channel15","name":"com.redhat.spice.0"}' \ +-chardev '{"id":"charchannel16","backend":{"type":"qemu-vdagent","data":{"= clipboard":false,"mouse":false}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":17,"char= dev":"charchannel16","id":"channel16","name":"chardev-vdagent"}' \ +-chardev '{"id":"charchannel17","backend":{"type":"dbus","data":{"name":"t= est.channel.0"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":18,"char= dev":"charchannel17","id":"channel17","name":"chardev-dbus"}' \ +-chardev '{"id":"charchannel18","backend":{"type":"spiceport","data":{"fqd= n":"test.channel.0"}}}' \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":19,"char= dev":"charchannel18","id":"channel18","name":"chardev-spiceport"}' \ +-audiodev '{"id":"audio1","driver":"spice"}' \ +-spice port=3D5901,addr=3D0.0.0.0,seamless-migration=3Don \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.xml b= /tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.xml new file mode 100644 index 0000000000..57a16b5b7c --- /dev/null +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.xml @@ -0,0 +1,149 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + +
+ + + + + + + + +
+ + + + +
+ + + +
+ + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + + + +
+ + + + + +
+ + + + + +
+ + + + + + + +
+ + + + + + + +
+ + + + +
+ + + + + +
+ + + +
+ + + + + + + +
+ + + + +
+ + + + +
+ + + + + + +