From nobody Mon Feb 9 00:07:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1592840584; cv=none; d=zohomail.com; s=zohoarc; b=FYZz2aXJn8Z/a8NUJpDVKUU2YvmDIYSa4NxENZhrTd0+Ft42lNOKcNpJ3LWMDieryBp9Y+P8QRPkJdvlVwktlwlZxgIt4E3GIBuH4Rdm2b5OB8ArArUopgRG7k/T9mXY/O7RP5M0asApwqewiH/cmW+/G9rY/C3CF1WijuZcRHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592840584; 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=rc5psmDzH6NGvYKpuHNQ8rn/yRbHI+gxdlnesW/xyuw=; b=IgPsrnJfvoC/jJ0ERx5TSmikkDySYZCNswzmRODOPJwk1r+l6qFFdtxKaxV9xQ3uVYEOQ+8Qugt3HsGwDYtSEv1ncMt5yksDvEwNyrH0rRFEdpACAyl6yjw+st9TlC211Tc4nJA6Io8sYRi+2P0GW/cydViEy95IeRNcN1IoSog= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1592840584059413.9591325645781; Mon, 22 Jun 2020 08:43:04 -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-462-cmOsSLvVPkWqOW74e3vPqQ-1; Mon, 22 Jun 2020 11:43:00 -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 ED1AE1005512; Mon, 22 Jun 2020 15:42:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B25F45C298; Mon, 22 Jun 2020 15:42:49 +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 7CB39833CE; Mon, 22 Jun 2020 15:42:49 +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 05MFgbl9020486 for ; Mon, 22 Jun 2020 11:42:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7565C5C220; Mon, 22 Jun 2020 15:42:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE2695C1BD for ; Mon, 22 Jun 2020 15:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592840582; 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=rc5psmDzH6NGvYKpuHNQ8rn/yRbHI+gxdlnesW/xyuw=; b=gFzuqG4aAfb+UDakJat85Nk4bhX75pEby/YgP+Q9GPKnxeuCgqVsGNUXJ/60Ye6jwWgBvJ /0tF4umRKE8SoZZ6nAAtdZZ8i7bSDpdqLcFt2yCmGE2BuLMTYbuZN8HDcYxZa5872uEyB3 aXNRSG7j+aSUZrcbzslHYikmOaKbEIA= X-MC-Unique: cmOsSLvVPkWqOW74e3vPqQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate iSCSI authentication cases Date: Mon, 22 Jun 2020 17:42:24 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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" Integrate both 'disk-hostdev-scsi-virtio-iscsi-auth-AES' and 'hostdev-scsi-virtio-iscsi-auth' as the new test infrastructure tests both legacy and 'secret' object cases. Signed-off-by: Peter Krempa --- ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 49 ---------------- ...isk-hostdev-scsi-virtio-iscsi-auth-AES.xml | 43 -------------- .../hostdev-scsi-virtio-iscsi-auth.args | 39 ------------- .../hostdev-scsi-virtio-iscsi-auth.xml | 48 ---------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 18 ++++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 18 ++++++ .../hostdev-scsi-virtio-scsi.xml | 18 ++++++ tests/qemuxml2argvtest.c | 8 --- .../hostdev-scsi-virtio-iscsi-auth.xml | 57 ------------------- .../hostdev-scsi-virtio-scsi.xml | 18 ++++++ tests/qemuxml2xmltest.c | 4 -- 12 files changed, 80 insertions(+), 248 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-a= uth-AES.args delete mode 100644 tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-a= uth-AES.xml delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.a= rgs delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.x= ml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth= .xml diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES= .args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args deleted file mode 100644 index 47b014aacc1..00000000000 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args +++ /dev/null @@ -1,49 +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 \ --object secret,id=3DmasterKey0,format=3Draw,\ -file=3D/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --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 \ --object secret,id=3Dvirtio-disk0-auth-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/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-disk0-auth-secret0,format= =3Draw,\ -if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk0,\ -id=3Dvirtio-disk0,bootindex=3D1 \ --object secret,id=3Dhostdev0-secret0,\ -data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/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=3D2,file.transport= =3Dtcp,\ -file.user=3Dmyname,file.password-secret=3Dhostdev0-secret0,if=3Dnone,forma= t=3Draw,\ -id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ -drive=3Ddrive-hostdev0,id=3Dhostdev0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES= .xml b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml deleted file mode 100644 index 3b13f9284c1..00000000000 --- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.xml +++ /dev/null @@ -1,43 +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-iscsi-auth.args b/t= ests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args deleted file mode 100644 index 4ce2029adb7..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.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://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/1,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://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ -3260/iqn.1992-01.com.example%3Astorage/2,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-auth.xml b/te= sts/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml deleted file mode 100644 index 388cd63314f..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.xml +++ /dev/null @@ -1,48 +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 c4b0b7ef7f6..c5a3c0ce61d 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 @@ -45,5 +45,13 @@ drive=3Ddrive-hostdev2,id=3Dhostdev2 \ format=3Draw,id=3Ddrive-hostdev3 \ -device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,\ drive=3Ddrive-hostdev3,id=3Dhostdev3 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/1,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-drive file=3Discsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@exampl= e.org:\ +3260/iqn.1992-01.com.example%3Astorage/2,if=3Dnone,format=3Draw,id=3Ddrive= -hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -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 c691b1dc050..de4047000ea 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 @@ -46,6 +46,24 @@ 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 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -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 6d00994e4d5..99b0117447a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -50,6 +50,24 @@ 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 \ +-object secret,id=3Dhostdev4-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D1,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev4 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,\ +drive=3Ddrive-hostdev4,id=3Dhostdev4 \ +-object secret,id=3Dhostdev5-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,\ +file.target=3Diqn.1992-01.com.example:storage,file.lun=3D2,file.transport= =3Dtcp,\ +file.user=3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,forma= t=3Draw,\ +id=3Ddrive-hostdev5 \ +-device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,\ +drive=3Ddrive-hostdev5,id=3Dhostdev5 \ -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 eec78b1c736..775b678b368 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -52,6 +52,24 @@
+ + + + + + + +
+ + + + + + + + +
+ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7a001b797a7..337fe1acdab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,14 +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-auth", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); - DO_TEST("disk-hostdev-scsi-virtio-iscsi-auth-AES", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_OBJECT_SECRET, - QEMU_CAPS_ISCSI_PASSWORD_SECRET); DO_TEST("hostdev-scsi-vhost-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_CCW); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml b/= tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml deleted file mode 100644 index b6dc1dbb8fe..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi-auth.xml +++ /dev/null @@ -1,57 +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 a8d70ef31be..9c823809abf 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -59,6 +59,24 @@
+ + + + + + + +
+ + + + + + + + +
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index edbd75039d3..2b61a6459e2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1039,10 +1039,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-iscsi-auth", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-subsys-mdev-vfio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_CCW_CSSID_UNRESTRICTED, --=20 2.26.2