From nobody Mon Feb 9 03:48:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 154894578637238.94552737523384; Thu, 31 Jan 2019 06:43:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5EC220B09; Thu, 31 Jan 2019 14:43:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FFF960C6E; Thu, 31 Jan 2019 14:43:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ADED7180339F; Thu, 31 Jan 2019 14:43:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0VEh1e9029552 for ; Thu, 31 Jan 2019 09:43:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8D25E3DBF; Thu, 31 Jan 2019 14:43:01 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1347019487 for ; Thu, 31 Jan 2019 14:43:00 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 31 Jan 2019 15:42:54 +0100 Message-Id: <3b042e7ad1fcd1a00b9334e447883483cd08e419.1548945696.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: qemu: Test network disks without format specified explicitly X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 31 Jan 2019 14:43:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Modify some existing tests of network-based disks to omit the storage format specification. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/disk-network-gluster.args | 2 +- tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-gluster.xml | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.args | 3 +-- tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2argvdata/disk-network-nbd.args | 3 +-- tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args | 3 +-- tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args | 3 +-- tests/qemuxml2argvdata/disk-network-nbd.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-gluster.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 2 +- 15 files changed, 15 insertions(+), 19 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemux= ml2argvdata/disk-network-gluster.args index 1538df9068..9952402d92 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.args @@ -26,7 +26,7 @@ if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -drive 'file=3Dgluster+unix:///Volume2/Image?socket=3D/path/to/sock,file.d= ebug=3D4,\ -format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1' \ +if=3Dnone,id=3Ddrive-virtio-disk1' \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ id=3Dvirtio-disk1 \ -drive file.driver=3Dgluster,file.volume=3DVolume3,file.path=3DImage.qcow2= ,\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args index c463db0ed5..a904ff5c70 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args @@ -29,7 +29,7 @@ if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -drive 'file=3Dgluster+unix:///Volume2/Image?socket=3D/path/to/sock,file.d= ebug=3D4,\ -format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1' \ +if=3Dnone,id=3Ddrive-virtio-disk1' \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ id=3Dvirtio-disk1 \ -drive file.driver=3Dgluster,file.volume=3DVolume3,file.path=3DImage.qcow2= ,\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 9b99db8715..a4e968b917 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -29,7 +29,7 @@ if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -drive 'file=3Dgluster+unix:///Volume2/Image?socket=3D/path/to/sock,file.d= ebug=3D4,\ -format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1' \ +if=3Dnone,id=3Ddrive-virtio-disk1' \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ id=3Dvirtio-disk1 \ -drive file.driver=3Dgluster,file.volume=3DVolume3,file.path=3DImage.qcow2= ,\ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.xml b/tests/qemuxm= l2argvdata/disk-network-gluster.xml index db40e661f7..8ba4e50b36 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.xml +++ b/tests/qemuxml2argvdata/disk-network-gluster.xml @@ -22,7 +22,7 @@ - + diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml= 2argvdata/disk-network-iscsi.args index 3cd3b5e03e..45da3a9de9 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -31,8 +31,7 @@ if=3Dnone,id=3Ddrive-virtio-disk1 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk1,\ id=3Dvirtio-disk1 \ -drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -6000/iqn.1992-01.com.example%3Astorage/1,format=3Draw,if=3Dnone,\ -id=3Ddrive-virtio-disk2 \ +6000/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,id=3Ddrive-virtio-disk2= \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk2,\ id=3Dvirtio-disk2 \ -drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 4b648a985d..e298220e09 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -40,7 +40,7 @@ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8w= BYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ -file.user=3Dmyname,file.password-secret=3Dvirtio-disk2-secret0,format=3Dra= w,if=3Dnone,\ +file.user=3Dmyname,file.password-secret=3Dvirtio-disk2-secret0,if=3Dnone,\ id=3Ddrive-virtio-disk2 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk2,\ id=3Dvirtio-disk2 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index be9ab18314..e7cc4cd1fd 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -40,7 +40,7 @@ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8w= BYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:6000,\ file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ -file.user=3Dmyname,file.password-secret=3Dvirtio-disk2-secret0,format=3Dra= w,if=3Dnone,\ +file.user=3Dmyname,file.password-secret=3Dvirtio-disk2-secret0,if=3Dnone,\ id=3Ddrive-virtio-disk2 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk2,\ id=3Dvirtio-disk2 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2= argvdata/disk-network-iscsi.xml index fa2a889b54..ecc8ead3cc 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2a= rgvdata/disk-network-nbd.args index 4abff25a0e..df4436b027 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.args @@ -24,8 +24,7 @@ server,nowait \ -drive file=3Dnbd:example.org:6000,format=3Draw,if=3Dnone,id=3Ddrive-virti= o-disk0 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-virtio-disk1 \ +-drive file=3Dnbd:example.org:6000:exportname=3Dbar,if=3Dnone,id=3Ddrive-v= irtio-disk1 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,\ id=3Dvirtio-disk1 \ -drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk2' \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args index 86bde153ee..330aadea4b 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args @@ -27,8 +27,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -drive file=3Dnbd:example.org:6000,format=3Draw,if=3Dnone,id=3Ddrive-virti= o-disk0 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-virtio-disk1 \ +-drive file=3Dnbd:example.org:6000:exportname=3Dbar,if=3Dnone,id=3Ddrive-v= irtio-disk1 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ id=3Dvirtio-disk1 \ -drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk2' \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 85452e715a..f7e8502385 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -27,8 +27,7 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -drive file=3Dnbd:example.org:6000,format=3Draw,if=3Dnone,id=3Ddrive-virti= o-disk0 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x2,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3Dnbd:example.org:6000:exportname=3Dbar,format=3Draw,if=3Dnone= ,\ -id=3Ddrive-virtio-disk1 \ +-drive file=3Dnbd:example.org:6000:exportname=3Dbar,if=3Dnone,id=3Ddrive-v= irtio-disk1 \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk1,\ id=3Dvirtio-disk1 \ -drive 'file=3Dnbd://[::1]:6000,format=3Draw,if=3Dnone,id=3Ddrive-virtio-d= isk2' \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxml2ar= gvdata/disk-network-nbd.xml index 2d5762f1b7..f9630d6655 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.xml +++ b/tests/qemuxml2argvdata/disk-network-nbd.xml @@ -22,7 +22,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml b/tests/qemu= xml2xmloutdata/disk-network-gluster.xml index 2c7c46b013..ae2899040f 100644 --- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml +++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml @@ -23,7 +23,7 @@
- + diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxm= l2xmloutdata/disk-network-iscsi.xml index f1348d583e..b089b2950d 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -31,7 +31,7 @@
- + diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2= xmloutdata/disk-network-nbd.xml index 818e8d7d7c..bb4223a3f0 100644 --- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml +++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml @@ -23,7 +23,7 @@
- + --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list