From nobody Wed May 15 00:16:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1586178238; cv=none; d=zohomail.com; s=zohoarc; b=jkqSSoNQXeRCdOZazGdLSrPsy1elIpJ5FvZn3CsSJXnjYMC6Rfr7XEKz+atycUrQc3UyIua76C8hiEwgfTn62GKCOjr5WkjHf0qDEhgnDMMveDiyomXoWUeNRSQ4dEI760UTIp5NL1w2VQ9gb97IQU2JIrFBJFTjhP+BOZY9Vao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586178238; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=IMijUqQSC5hWsPSkmPo2rsfl7PjyeP+vmqN2WTq4gLM=; b=Ctin27VZ3pzr4HUs6LBXTHVHSLj6vKVJwrxvG1xw7Su6iLhpMSLCqJ5pEOPnjigI+UKexWnxCBfaOFYnDrEEbYqEJ4venF0OWT/4IMnllvsb+Xv1UElmuEDdT03ehPMZsbXoVnfq1aZmGLesrS/w6hn81F+A19jUOngbZ6dnLUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1586178238919156.55841997933305; Mon, 6 Apr 2020 06:03:58 -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-85-E2nUqI-eNv-KDHnthceQVA-1; Mon, 06 Apr 2020 09:03:54 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98F4D8018A4; Mon, 6 Apr 2020 13:03:48 +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 2E30F60BE0; Mon, 6 Apr 2020 13:03:46 +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 E47A81809563; Mon, 6 Apr 2020 13:03:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 036D3e2R014476 for ; Mon, 6 Apr 2020 09:03:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id B3CB62026D69; Mon, 6 Apr 2020 13:03:40 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF542200AD4C for ; Mon, 6 Apr 2020 13:03:38 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 17663800298 for ; Mon, 6 Apr 2020 13:03:38 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-30-UmdRQKClO1u5zJkc9ir9TQ-1; Mon, 06 Apr 2020 09:03:35 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 036D3S7P086835 for ; Mon, 6 Apr 2020 09:03:34 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 3082hwcpj1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Apr 2020 09:03:32 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Apr 2020 14:03:00 +0100 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 6 Apr 2020 14:02:57 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 036D3HXu47317500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 6 Apr 2020 13:03:17 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 98691A4051; Mon, 6 Apr 2020 13:03:17 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 72A00A4059; Mon, 6 Apr 2020 13:03:17 +0000 (GMT) Received: from m46lp64.lnxne.boe (unknown [9.152.108.100]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 6 Apr 2020 13:03:17 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586178236; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IMijUqQSC5hWsPSkmPo2rsfl7PjyeP+vmqN2WTq4gLM=; b=Bp7Qdm0R4z5T+u3EWUk7URN4iVaak2fzcgPAxmFJVBZ+7WDL4KEuG1UQrmh364eGu3jVVi QopaPEi1wNWr//VjuY6KUmEg2PDP5FfDkuCNUNh480AE8H5Z06pcorBAy7biZo1VelUh38 TkOrTbHjW/eLB9KX96y2xB9dqU9voB0= X-MC-Unique: E2nUqI-eNv-KDHnthceQVA-1 X-MC-Unique: UmdRQKClO1u5zJkc9ir9TQ-1 From: Bjoern Walk To: libvir-list@redhat.com Subject: [PATCH v2] qemu: capabilities: update qemu-4.2 capabilities for s390x Date: Mon, 6 Apr 2020 15:03:14 +0200 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20040613-4275-0000-0000-000003BAA9DC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20040613-4276-0000-0000-000038D0078A Message-Id: <20200406130314.672677-1-bwalk@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-06_07:2020-04-06, 2020-04-06 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 spamscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004060112 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 036D3e2R014476 X-loop: libvir-list@redhat.com Cc: Bjoern Walk 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.12 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" Update s390x capabilities for QEMU 4.2 with the actual GA version for QEMU and on the latest z15 machine. This picks up the new blockdev capability, so we need to refresh a bunch of test cases as well. Acked-by: Christian Borntraeger Reviewed-by: Peter Krempa Reviewed-by: Boris Fiuczynski Signed-off-by: Bjoern Walk Reviewed-by: J=C3=A1n Tomko --- Replies are stripped, full patch here: https://gitlab.com/bwalk/libvirt/-/commit/90d7b52567fdce4ad5158ff4e0863= d0540f42fcc tests/domaincapsdata/qemu_4.2.0.s390x.xml | 47 +- .../caps_4.2.0.s390x.replies | 3230 +++++++++-------- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 216 +- ...default-video-type-s390x.s390x-latest.args | 8 +- .../disk-error-policy-s390x.s390x-latest.args | 30 +- .../fs9p-ccw.s390x-latest.args | 7 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 14 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 8 +- .../s390x-ccw-graphics.s390x-latest.args | 8 +- .../s390x-ccw-headless.s390x-latest.args | 8 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 7 +- .../vhost-vsock-ccw.s390x-latest.args | 7 +- 12 files changed, 1892 insertions(+), 1698 deletions(-) diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_4.2.0.s390x.xml index fbb3905f..6b87e450 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -27,9 +27,17 @@ - z13.2-base + gen15a-base + + + + + + + + @@ -38,15 +46,26 @@ + + + + + + + + + + + @@ -58,8 +77,8 @@ z890.2-base z9EC.2 z13.2 - z990.5-base z9BC-base + z990.5-base z890.2 z890 z9BC @@ -69,9 +88,9 @@ z990.3 z13s-base z9EC - gen15a - z14ZR1-base - z14.2-base + gen15a + z14ZR1-base + z14.2-base z900.3-base z13.2-base z196.2-base @@ -86,18 +105,18 @@ z10EC.2 z10EC-base z900.3 - z14ZR1 + z14ZR1 z10BC z10BC.2-base - z9BC.2 z990.2 + z9BC.2 z990 - z14 - gen15b-base + z14 + gen15b-base z990.4 max z10EC.2-base - gen15a-base + gen15a-base z800 zEC12.2 z10EC @@ -111,12 +130,12 @@ z196-base z9EC.2-base z196.2 - z14.2 + z14.2 z990-base z900.2 z890-base z10EC.3 - z14-base + z14-base z990.4-base z10EC.3-base z10BC-base @@ -126,7 +145,7 @@ zBC12 z890.3-base z990.5 - gen15b + gen15b qemu @@ -198,7 +217,7 @@ - + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_4.2.0.s390x.replies index be709b3c..82b60bf0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -17,11 +17,11 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 47894de6..ae52b0c9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -8,12 +8,14 @@ + + @@ -49,6 +51,7 @@ + @@ -115,6 +118,7 @@ + @@ -134,20 +138,30 @@ + + - 4001050 + 4002000 0 39100242 - v4.1.0-1686-g419af24e7e-dirty + qemu-4.2.0-20200115.0.1e4aa2da.fc31 s390x - + + + + + + + + + @@ -156,15 +170,26 @@ + + + + + + + + + + + @@ -175,8 +200,8 @@ - + @@ -187,46 +212,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -241,66 +229,18 @@ - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + @@ -314,35 +254,12 @@ - - - - - - - - - - - - - - - - - + - - - - - - - - + @@ -352,30 +269,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - + @@ -595,7 +489,7 @@ - + @@ -607,9 +501,13 @@ + + + + - + @@ -621,11 +519,7 @@ - - - - @@ -1869,7 +1763,7 @@ - + @@ -1881,16 +1775,9 @@ - - - - - - - - + @@ -1902,7 +1789,14 @@ + + + + + + + diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 934c5d59..47818085 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-default-video-type-s/master-key.aes \ -machine s390-ccw-virtio,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu z13.2-base,aen=3Don,aefsi=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Do= n,msa1=3Don,\ -sthyi=3Don,edat=3Don,ri=3Don,edat2=3Don,vx=3Don,ipter=3Don,ap=3Don,esop=3D= on,apft=3Don,apqci=3Don,\ -cte=3Don,bpb=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ +-cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,csske=3Don,mep= och=3Don,msa9=3Don,\ +msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1= =3Don,sthyi=3Don,\ +edat=3Don,ri=3Don,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,m= epochptff=3Don,ap=3Don,\ +vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,iep=3Don,\ +apqci=3Don,cte=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,t= e=3Don,cmm=3Don \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index 0d9254e1..414ffdba 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -26,17 +26,29 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/var/images/image1,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk0,\ -cache=3Dnone \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"file","filename":"/var/images/image1",\ +"node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-3-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-3-form= at,\ id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dst= op \ --drive file=3D/var/images/image2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk1,\ -cache=3Dnone \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Ddrive-virtio-d= isk1,\ +-blockdev '{"driver":"file","filename":"/var/images/image2",\ +"node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Dlibvirt-2-form= at,\ id=3Dvirtio-disk1,write-cache=3Don,werror=3Denospc \ --drive file=3D/var/images/image3,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk2,\ -cache=3Dnone \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Ddrive-virtio-d= isk2,\ +-blockdev '{"driver":"file","filename":"/var/images/image3",\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk2,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemu= xml2argvdata/fs9p-ccw.s390x-latest.args index 4a93ee37..50d4bc42 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -26,8 +26,11 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-ccw,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,\ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index bdc060aa..20288f2a 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -29,12 +29,18 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-shutdown \ -boot strict=3Don \ -device virtio-scsi-ccw,iothread=3Diothread2,id=3Dscsi0,devno=3Dfe.0.0001 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"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-ccw,iothread=3Diothread1,scsi=3Doff,devno=3Dfe.0.0000,\ -drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-scs= i0-0-2-0 \ +drive=3Dlibvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ -device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D0,\ -device_id=3Ddrive-scsi0-0-2-0,drive=3Ddrive-scsi0-0-2-0,id=3Dscsi0-0-2-0 \ +device_id=3Ddrive-scsi0-0-2-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-2-0 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index 03860194..35093d4f 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-test/master-key.aes \ -machine s390-ccw-virtio-4.2,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu z13.2-base,aen=3Don,aefsi=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Do= n,msa1=3Don,\ -sthyi=3Don,edat=3Don,ri=3Don,edat2=3Don,vx=3Don,ipter=3Don,ap=3Don,esop=3D= on,apft=3Don,apqci=3Don,\ -cte=3Don,bpb=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,te=3Don,cmm=3Don \ +-cpu gen15a-base,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,csske=3Don,mep= och=3Don,msa9=3Don,\ +msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1= =3Don,sthyi=3Don,\ +edat=3Don,ri=3Don,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,m= epochptff=3Don,ap=3Don,\ +vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apqi= =3Don,apft=3Don,iep=3Don,\ +apqci=3Don,cte=3Don,bpb=3Don,gs=3Don,ppa15=3Don,zpci=3Don,sea_esop2=3Don,t= e=3Don,cmm=3Don \ -m 256 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 8f72b20b..5850b265 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -26,9 +26,11 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -no-shutdown \ -boot strict=3Don \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0003 \ --drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:1a:29= ,\ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 95caf9e9..211cc24b 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -27,9 +27,11 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -no-shutdown \ -boot strict=3Don \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0002 \ --drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ -id=3Ddrive-virtio-disk0 \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,\ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args = b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index 17b5ded6..4c5542d8 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -26,8 +26,11 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index 81a6b8cb..de229bd0 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -26,8 +26,11 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Dlibvirt-1-form= at,\ id=3Dvirtio-disk0,bootindex=3D1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ --=20 2.24.1