From nobody Mon Feb 9 00:30:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592840650; cv=none; d=zohomail.com; s=zohoarc; b=CWnTO49kgkZZQPCfIUeRBT6WvKiL72KFn4kVKm9DDwacJDKLPl3KpEyNl+TwQLOFERbeVCByFixqlZJxjFdcdTgQewj0nVKxgxEnn2NOPNv2qfP5OYN5wi0gWUSYV1AgE7SXu/5CJZlFnDikiTZ+TlkBHoSqKjYg4/MCEE0u+kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840650; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JOzR1mA2PnOqIL9m2wSB2zBwxam8ArbhhxY/bdAD6vI=; b=ludc3lDV65pDP6Sh1fg/nhWd8EZGU4Ge9NZSQ1sYqOuGLdBigFHhCLFL9CO4Lg49OmiEwBNBrnYHySpjnKH2QvuyXCU/h3LrmGCK6fXyHwZr4ik/S+DSj3DcR0efAfjundOJOjRTbZ8/sSH8OPTpf41UpUZvHTLXaxrVqwZJYgU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592840650083115.57988065339134; Mon, 22 Jun 2020 08:44:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-akpRyAgTOVqKyiLU1smlgw-1; Mon, 22 Jun 2020 11:42:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B89031883627; Mon, 22 Jun 2020 15:42:47 +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 72D3B5C220; Mon, 22 Jun 2020 15:42:47 +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 435A0180530F; Mon, 22 Jun 2020 15:42:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05MFga0V020478 for ; Mon, 22 Jun 2020 11:42:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8912D5C1BD; Mon, 22 Jun 2020 15:42:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07CA25C220 for ; Mon, 22 Jun 2020 15:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840648; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JOzR1mA2PnOqIL9m2wSB2zBwxam8ArbhhxY/bdAD6vI=; b=QwCmOae6BRJn/JCFI3rhbADysKPdnlEzth9JCUiaHG8q1GkXxAwz0AZUcDj9kZofI8mQXr idPuybWyEcnGwXROo0ip/qhQuohp91l3s0VTO/RxEarWSH7zw2NGznisHsBp2om76czf1m cOCkQUp4ZXi37kIfGswtwJR+Scpjfpo= X-MC-Unique: akpRyAgTOVqKyiLU1smlgw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-virtio-iscsi' case Date: Mon, 22 Jun 2020 17:42:23 +0200 Message-Id: <34e222b46a4182bdbb9a5d6455ca04960e53269f.1592840388.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We can add the iSCSI hostdevs to the same test file. Signed-off-by: Peter Krempa --- .../hostdev-scsi-virtio-iscsi.args | 39 -------------- .../hostdev-scsi-virtio-iscsi.xml | 42 --------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 10 ++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 10 ++++ .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-virtio-iscsi.xml | 51 ------------------- .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 52 insertions(+), 138 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/= qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args deleted file mode 100644 index 050e74a449d..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest2 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name QEMUGuest2 \ --S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest2/moni= tor.sock,\ -server,nowait \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ -format=3Draw,id=3Ddrive-hostdev1 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ -drive=3Ddrive-hostdev1,id=3Dhostdev1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/q= emuxml2argvdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 88684c94054..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,42 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - - - - - - - -
- - - - - -
- - - - diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index 50353df478c..c4b0b7ef7f6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -37,5 +37,13 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/0,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file=3Discsi://example.org:3260/iqn.1992-01.com.example/1,if=3Dnone= ,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index e0680fce4cf..c691b1dc050 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -36,6 +36,16 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 0da84d08b30..6d00994e4d5 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -40,6 +40,16 @@ drive=3Ddrive-hostdev0,id=3Dhostdev0 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,\ drive=3Ddrive-hostdev1,id=3Dhostdev1 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev2 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,\ +drive=3Ddrive-hostdev2,id=3Dhostdev2 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,\ +format=3Draw,id=3Ddrive-hostdev3 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ +drive=3Ddrive-hostdev3,id=3Dhostdev3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qe= muxml2argvdata/hostdev-scsi-virtio-scsi.xml index 013c8cd17f7..eec78b1c736 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -40,6 +40,18 @@
+ + + + +
+ + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e10d90fbf88..7a001b797a7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,9 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests= /qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 4addf5ebc87..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,51 +0,0 @@ - - QEMUGuest2 - c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - -
- - -
- - -
- - - - - - - - -
- - - - - -
- - -
- - - diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/= qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index a1fa36de386..a8d70ef31be 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -47,6 +47,18 @@
+ + + + +
+ + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d3da788979d..edbd75039d3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1039,9 +1039,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); --=20 2.26.2