From nobody Sun Feb 8 21:59:29 2026 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 --- .../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