From nobody Sun Feb 8 10:04:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 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=1632315858; cv=none; d=zohomail.com; s=zohoarc; b=bvpmz63gEMR9hY8sQbG/5zSbIw5bAyhPFAeK+58hZ+PFYlYCR7rbrzphWkhcF/X/ZFqUUYYaFXvEyp1bW/5bDup/kXAs+/FJlj9wj7tc7CuXrEXCXy4nwmb44PKPVD+4TOlnblxwfhahDYYbyhP7LZFg9CxJhlrOzrRqURzpOeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315858; 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=vzSG9uhu837seEBAj8NrcaTNphotAj5T82ziBUpHrYw=; b=FWTPdXN7J/LnRpKjp58ecqmjDDWDvVw7eHacZ3jEZbsTzN3nAFYWYzJCpLVGExoITrwUGdp7ao2ozTYx4xMc6q693AdQpn1CIWDx35e1dNpn8AeYLn8xuEA66oCtHakdaYsXzI6f2fre6F3Lb/aSxSJ/gyVGB2CZBOb5VyZHccA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 163231585850534.87340368717787; Wed, 22 Sep 2021 06:04:18 -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-541-hly4-_vqNLOIiObWoh0N3A-1; Wed, 22 Sep 2021 09:04:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A27B484A5E1; Wed, 22 Sep 2021 13:04:03 +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 60B976B55A; Wed, 22 Sep 2021 13:04: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 2CD9D4EA30; Wed, 22 Sep 2021 13:04:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD4101020843 for ; Wed, 22 Sep 2021 09:04:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6205029671; Wed, 22 Sep 2021 13:04:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB7974F0BA for ; Wed, 22 Sep 2021 13:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315853; 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=vzSG9uhu837seEBAj8NrcaTNphotAj5T82ziBUpHrYw=; b=CMqZDr6LusZcGvr/5j3JXz2pIv8Ln8y0rBwFILQkYtxt3KcT9Lww9NYq+jcypGXdpfJS4E 1B94p3RaY9rL3SMEAi87ZX+DATID6Dc0jCPdjExj1w2N76E0hPeALCtEFPOgIw4p6jX6AN UTzNAOHpU0asw+utEsJfp2iWNUaU8i0= X-MC-Unique: hly4-_vqNLOIiObWoh0N3A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/20] qemuxml2argvtest: Replace 'disk-network-iscsi' by the more comprehensive 'disk-network-iscsi-modern' Date: Wed, 22 Sep 2021 15:02:20 +0200 Message-Id: <47e9dc8210a06cf43597bcb55cee381ccceba996.1632315628.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315867935100003 Content-Type: text/plain; charset="utf-8" Move the contents of 'disk-network-iscsi-modern' into 'disk-network-iscsi' to reuse the name and also invocation with real capablities and remove the leftovers. Signed-off-by: Peter Krempa --- .../disk-network-iscsi-modern.args | 47 ---------- .../disk-network-iscsi-modern.xml | 88 ------------------- .../disk-network-iscsi.x86_64-2.12.0.args | 5 ++ .../disk-network-iscsi.x86_64-latest.args | 31 ++++--- tests/qemuxml2argvdata/disk-network-iscsi.xml | 25 +++++- tests/qemuxml2argvtest.c | 3 - .../qemuxml2xmloutdata/disk-network-iscsi.xml | 25 ++++++ 7 files changed, 73 insertions(+), 151 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/= qemuxml2argvdata/disk-network-iscsi-modern.args deleted file mode 100644 index c9060c0db6..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ /dev/null @@ -1,47 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/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-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --usb \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,file.target=3Diq= n.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,format=3Draw,if=3Dn= one,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,file.target=3Diq= n.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,format=3Draw,if=3Dn= one,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,i= d=3Dvirtio-disk1 \ --object secret,id=3Dvirtio-disk2-auth-secret0,data=3D9eao5F8qtkGt+seB1HYiv= WIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQ= FBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D1,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dvirtio-disk2-auth-secret0,format=3Draw,if= =3Dnone,id=3Ddrive-virtio-disk2 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk2,i= d=3Dvirtio-disk2 \ --object secret,id=3Dvirtio-disk3-auth-secret0,data=3D9eao5F8qtkGt+seB1HYiv= WIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQ= FBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:6000,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D2,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dvirtio-disk3-auth-secret0,format=3Draw,if= =3Dnone,id=3Ddrive-virtio-disk3 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk3,i= d=3Dvirtio-disk3 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,format=3Draw,if=3Dn= one,id=3Ddrive-scsi0-0-0-0 \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dd= rive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:server,file.lun=3D0,file.transport=3Dtcp,file.initiat= or-name=3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnone,id=3Ddrive-= scsi0-0-0-1 \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dd= rive-scsi0-0-0-1,id=3Dscsi0-0-0-1 \ --object secret,id=3Dscsi0-0-0-2-auth-secret0,data=3D9eao5F8qtkGt+seB1HYivW= IxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQF= BgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ --drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:server,file.lun=3D0,file.transport=3Dtcp,file.user=3D= myname,file.password-secret=3Dscsi0-0-0-2-auth-secret0,file.initiator-name= =3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0= -0-2 \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive=3Dd= rive-scsi0-0-0-2,id=3Dscsi0-0-0-2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml b/tests/q= emuxml2argvdata/disk-network-iscsi-modern.xml deleted file mode 100644 index 07bb457bfa..0000000000 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.xml +++ /dev/null @@ -1,88 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 ef4dd81ff8..92c27dc1b0 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 @@ -39,5 +39,10 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-vir= tio-disk3,id=3Dvirtio-disk3 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,format=3Draw,if=3Dn= one,id=3Ddrive-scsi0-0-0-0 \ -device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dd= rive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:server,file.lun=3D0,file.transport=3Dtcp,file.initiat= or-name=3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnone,id=3Ddrive-= scsi0-0-0-1 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dd= rive-scsi0-0-0-1,id=3Dscsi0-0-0-1 \ +-object secret,id=3Dscsi0-0-0-2-auth-secret0,data=3D9eao5F8qtkGt+seB1HYivW= IxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQF= BgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:server,file.lun=3D0,file.transport=3Dtcp,file.user=3D= myname,file.password-secret=3Dscsi0-0-0-2-auth-secret0,file.initiator-name= =3Diqn.1992-01.com.example:client,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0= -0-2 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive=3Dd= rive-scsi0-0-0-2,id=3Dscsi0-0-0-2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 84dbb97ecf..9fa6c5f259 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -28,23 +28,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-7-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk1 \ +-object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk0,bootindex=3D1 \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-4-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk2 \ +-object '{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-4-storage-auth-secret0","node-name":"libvirt-4-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ --object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk3 \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ --object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ --blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-2-storage-auth-secret0","node-name":"libvirt-2-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-3-format,id=3Dscsi0-0-0-0 \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.19= 92-01.com.example:client","node-name":"libvirt-2-storage","auto-read-only":= true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ --blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-1-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-1 \ +-object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ +-blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","user":"myname","passwor= d-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.co= m.example:client","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-0 \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-2 \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxml2= argvdata/disk-network-iscsi.xml index 8a55f1b23b..07bb457bfa 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.xml +++ b/tests/qemuxml2argvdata/disk-network-iscsi.xml @@ -29,7 +29,7 @@ - + @@ -55,6 +55,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6d860fab95..ea3fc5901d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1341,9 +1341,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-transient"); DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST("disk-network-iscsi-modern", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_BLOCK); DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-in= valid"); diff --git a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxm= l2xmloutdata/disk-network-iscsi.xml index a2fdaac5b0..d7e1b9ffff 100644 --- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml @@ -60,6 +60,31 @@
+ + + + + + + + + +
+ + + + + + + + + + + + + +
+
--=20 2.31.1