From nobody Thu Dec 18 19:29:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1729251571565498.7841887765387; Fri, 18 Oct 2024 04:39:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3F9F514C7; Fri, 18 Oct 2024 07:39:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C6B3012D1; Fri, 18 Oct 2024 07:37:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 235B612B1; Fri, 18 Oct 2024 07:37:42 -0400 (EDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 87805961 for ; Fri, 18 Oct 2024 07:37:39 -0400 (EDT) Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49I5a51O013887 for ; Fri, 18 Oct 2024 11:37:38 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42bhnf9s5b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 18 Oct 2024 11:37:38 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49I8Hw6A006761 for ; Fri, 18 Oct 2024 11:37:37 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4284xkm34j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 18 Oct 2024 11:37:36 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49IBbW5p51904880 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Oct 2024 11:37:32 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 78D522004B; Fri, 18 Oct 2024 11:37:32 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 427EF20040; Fri, 18 Oct 2024 11:37:32 +0000 (GMT) Received: from a46lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 18 Oct 2024 11:37:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=8x7+laAFWBdeki6lP71uYmGMnavAT7obSXJ3xspY8 B0=; b=nnABgzwtzl0FXmvqs6m1n7FWO2BhowF6nj3hnPLNPVNWHl/Kkfzwrp0/f /Em/oYFV7Xr4RCILqbkj4rUv40YJdAayqv530ENNesXomUj/u3hwH27dLu7/yQZt BypjQ7OPEWZBG+xIQ+t/0S9KeCQJUX+z6Np+KPGU/3oHmLG2ZkXdWaY+IlZkRIcy C2/nNJBbRJexJ0pK2G2l1SKSaoyx5RZLqnDuUx5Dw2z93KzZWBrvXgIFBg+mioRg jtUix8UggKr7pMShFo8JaYAJaLtnFtguyfYPIJg3UvEyZ7bRv+eKr8czALZ3uuTP Y0QKwkQwxqnNCyqN9RdzX+rMH46nw== From: Shalini Chellathurai Saroja To: Libvirt Mailing List Subject: [PATCH v1] tests: add capabilities for QEMU 9.1.0 on s390x Date: Fri, 18 Oct 2024 13:37:27 +0200 Message-ID: <20241018113727.13684-1-shalini@linux.ibm.com> X-Mailer: git-send-email 2.44.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: krcEx2Oq6oARjKprKpK60lGJ7cYz4T1q X-Proofpoint-ORIG-GUID: krcEx2Oq6oARjKprKpK60lGJ7cYz4T1q X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 adultscore=0 spamscore=0 phishscore=0 clxscore=1011 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410180073 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HQDFGAVGB3NJJY2JSMF43KDCKVCQLPFM X-Message-ID-Hash: HQDFGAVGB3NJJY2JSMF43KDCKVCQLPFM X-MailFrom: shalini@linux.ibm.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: Shalini Chellathurai Saroja , Boris Fiuczynski X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729251572870116600 Content-Type: text/plain; charset="utf-8" Let us introduce the xml and reply files for QEMU 9.1.0 on s390x. Signed-off-by: Shalini Chellathurai Saroja Reviewed-by:Boris Fiuczynski The replies and xml files are removed from this patch and is available in https://gitlab.com/shalinichellathurai/libvirt/-/commit/9352fc34fcdb9921eaf= 1abe51c204a4db79e2672 --- tests/domaincapsdata/qemu_9.1.0.s390x.xml | 306 + .../caps_9.1.0_s390x.replies | 36291 ++++++++++++++++ .../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 3748 ++ tests/qemuhotplugtest.c | 8 - .../console-sclp.s390x-latest.args | 5 +- .../console-virtio-ccw.s390x-latest.args | 5 +- ...default-video-type-s390x.s390x-latest.args | 2 +- .../disk-virtio-ccw-many.s390x-latest.args | 20 +- .../disk-virtio-ccw.s390x-latest.args | 10 +- .../disk-virtio-s390-zpci.s390x-latest.args | 5 +- .../fs9p-ccw.s390x-latest.args | 5 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 5 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- .../input-virtio-ccw.s390x-latest.args | 5 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 10 +- .../launch-security-s390-pv.s390x-latest.args | 7 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 5 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 5 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 5 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 5 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 5 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 5 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 5 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 5 +- ...achine-keywrap-none-caps.s390x-latest.args | 5 +- .../machine-keywrap-none.s390x-latest.args | 5 +- ...multiple-disks-nets-s390.s390x-latest.args | 10 +- .../machine-loadparm-s390.s390x-latest.args | 5 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- .../vhost-user-fs-ccw.s390x-latest.args | 5 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 5 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 5 +- .../vhost-vsock-ccw.s390x-latest.args | 5 +- ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 5 +- .../video-virtio-gpu-ccw.s390x-latest.args | 5 +- .../virtio-rng-ccw.s390x-latest.args | 5 +- .../watchdog-diag288.s390x-latest.args | 5 +- 39 files changed, 40423 insertions(+), 122 deletions(-) create mode 100644 tests/domaincapsdata/qemu_9.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml diff --git a/tests/domaincapsdata/qemu_9.1.0.s390x.xml b/tests/domaincapsda= ta/qemu_9.1.0.s390x.xml new file mode 100644 index 0000000000..cd896ceffd --- /dev/null +++ b/tests/domaincapsdata/qemu_9.1.0.s390x.xml @@ -0,0 +1,306 @@ + + /usr/bin/qemu-system-s390x + kvm + s390-ccw-virtio-9.1 + s390x + + + + + + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd + + rom + pflash + + + yes + no + + + no + + + + + + + off + + + + + on + off + + + + gen16a-base + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + z13 + z990.3 + z13-base + z990.2 + z196.2-base + z14 + z14.2-base + z990.4 + z196 + z10BC.2-base + z114-base + gen16b + z890.3-base + gen16a + z990.5 + z196.2 + zEC12 + zEC12.2 + z9EC.2 + z9BC + z9EC.3-base + z800-base + z14ZR1-base + z890 + z990.4-base + z9EC.3 + z13.2 + z10BC.2 + gen15a-base + z14.2 + zBC12-base + gen16a-base + z900.3 + z196-base + z990 + z14-base + z900.2 + z800 + z10EC + z10EC.2 + z14ZR1 + z900 + z10EC.2-base + z900.2-base + z900-base + z10EC.3 + z990.5-base + max + gen15b + z9BC.2-base + gen15a + z990.2-base + z10EC-base + gen16b-base + z114 + z9EC-base + z13s + qemu + gen15b-base + zEC12-base + z890.3 + z10EC.3-base + z890.2-base + z890.2 + z10BC-base + zEC12.2-base + z890-base + z9BC-base + z10BC + z9EC + z9EC.2-base + z900.3-base + z13.2-base + z990.3-base + z13s-base + zBC12 + z990-base + z9BC.2 + + + + + file + anonymous + memfd + + + + + + disk + cdrom + floppy + lun + + + fdc + scsi + virtio + usb + + + virtio + virtio-transitional + virtio-non-transitional + + + + + sdl + vnc + egl-headless + dbus + + + + + + subsystem + + + default + mandatory + requisite + optional + + + usb + pci + scsi + + + + default + vfio + + + + + virtio + virtio-transitional + virtio-non-transitional + + + random + egd + builtin + + + + + path + handle + virtiofs + + + + + + usb + + + + + pty + unix + + + + + virtio + + + qemu + + + builtin + lkcf + + + + + default + passt + + + + + + + + + + + + + + + + + s390-pv + + + + diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.1.0_s390x.replies new file mode 100644 index 0000000000..4e54acb5b1 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -0,0 +1,36291 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.1.0_s390x.xml new file mode 100644 index 0000000000..50e9a60a1f --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -0,0 +1,3748 @@ [...] diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index f707121c47..d2a1f5acf1 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -643,40 +643,33 @@ mymain(void) "chardev-remove", QMP_OK, "query-fdsets", "{\"return\":= []}"); =20 DO_TEST_ATTACH("s390x", "base-ccw-live", "ccw-virtio", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); DO_TEST_DETACH("s390x", "base-ccw-live", "ccw-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); =20 DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2= ", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); =20 DO_TEST_DETACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2= ", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); =20 DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2= -explicit", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); =20 DO_TEST_DETACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2= -explicit", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK, - "blockdev-del", QMP_OK, "blockdev-del", QMP_OK); =20 /* Attach a second device, then detach the first one. Then attach the = first one again. */ DO_TEST_ATTACH("s390x", "base-ccw-live-with-ccw-virtio", "ccw-virtio-2= -explicit", false, true, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); @@ -685,7 +678,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK= ); =20 DO_TEST_ATTACH("s390x", "base-ccw-live-with-2-ccw-virtio", "ccw-virtio= -1-reverse", false, false, - "blockdev-add", QMP_OK, "blockdev-add", QMP_OK, "device_add", QMP_OK, "query-block", QMP_EMPTY_ARRAY); diff --git a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args b/tests/q= emuxmlconfdata/console-sclp.s390x-latest.args index 3e0456b4a2..09c0df6954 100644 --- a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args b/t= ests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args index 7077028dbd..547243529a 100644 --- a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0= .0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.ar= gs b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args index b3f55e8a21..1c1a1066e4 100644 --- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-s/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-default-video-type-s/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D1048576k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":107374182= 4}' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args b= /tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args index 47f485bab0..6c32bd7af6 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args @@ -26,18 +26,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-4-= format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-3= -format","id":"virtio-disk1"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0001","drive":"libvirt-2= -format","id":"virtio-disk2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.2.f00f","drive":"libvirt-1= -format","id":"virtio-disk3"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-4-= storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-name":"libvirt-3-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-3= -storage","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0001","drive":"libvirt-2= -storage","id":"virtio-disk2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.2.f00f","drive":"libvirt-1= -storage","id":"virtio-disk3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args index 5456a25c8f..546637a943 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args @@ -26,12 +26,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-2= -format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-1-= format","id":"virtio-disk1"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-2= -storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"0.0.0007","drive":"libvirt-1-= storage","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args = b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args index 3a8bf53390..ee4f86ce61 100644 --- a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args @@ -26,10 +26,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGu= est1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"zpci","uid":25,"fid":31,"target":"virtio-disk0","id":"= zpci25"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args b/tests/qemux= mlconfdata/fs9p-ccw.s390x-latest.args index 2fb3203b9c..c7353dd8e4 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device '{"driver":"virtio-9p-ccw","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","devno":"fe.0.0001"}' \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/to/guest2 \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest= .args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args index 1668c6634d..bce866221a 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"virtio-scsi-ccw","id":"scsi0","devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-ccw","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","devno":"fe.0.0002"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0003= "}' \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args index 69f2679f6f..d69ebfc8fd 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-KVMGues= t1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-KVMGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args b/tes= ts/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args index 7cf73299f6..fc32804695 100644 --- a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -device '{"driver":"virtio-keyboard-ccw","id":"input0","devno":"fe.0.0002"= }' \ -device '{"driver":"virtio-mouse-ccw","id":"input1","devno":"fe.0.0003"}' \ -device '{"driver":"virtio-tablet-ccw","id":"input2","devno":"fe.0.0004"}'= \ diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.a= rgs b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args index ed7971d632..953edb5445 100644 --- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -29,12 +29,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"virtio-scsi-ccw","iothread":"iothread2","id":"scsi0","= devno":"fe.0.0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","iothread":"iothread1","devno":"fe.0.0= 000","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":2,"lun"= :0,"device_id":"drive-scsi0-0-2-0","drive":"libvirt-1-format","id":"scsi0-0= -2-0"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","iothread":"iothread1","devno":"fe.0.0= 000","drive":"libvirt-2-storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":2,"lun"= :0,"device_id":"drive-scsi0-0-2-0","drive":"libvirt-1-storage","id":"scsi0-= 0-2-0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.000a= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.arg= s b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args index 5c042913a1..4f052238e9 100644 --- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram,confidential-guest-support=3Dlsec0 \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -object '{"qom-type":"s390-pv-guest","id":"lsec0"}' \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.= args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args index de274c6336..3c17b8cb3b 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest= .args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args index de274c6336..3c17b8cb3b 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args index fb9b8fdc7a..583885e470 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.= args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args index fb9b8fdc7a..583885e470 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.= args b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args index 4ffb2f3609..6270b7e43a 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest= .args b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args index 4ffb2f3609..6270b7e43a 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args index bb79e9e886..c0104970b5 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.= args b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args index bb79e9e886..c0104970b5 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args index 516768833a..10594504bc 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args b= /tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args index 516768833a..10594504bc 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s39= 0.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks= -nets-s390.s390x-latest.args index 1e651e7870..411b62f3ee 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -latest.args @@ -26,12 +26,10 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0002","drive":"libvirt-2= -format","id":"virtio-disk0","bootindex":1}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0003","drive":"libvirt-1= -format","id":"virtio-disk1","bootindex":3}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0002","drive":"libvirt-2= -storage","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0003","drive":"libvirt-1= -storage","id":"virtio-disk1","bootindex":3}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:54","bootindex":2,"devno":"fe.0.0000"}' \ -netdev '{"type":"user","id":"hostnet1"}' \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args = b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args index b11d958117..896fc1e578 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390= x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s= 390x-latest.args index 14954d02a2..a6d8ba5952 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-lates= t.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio-4.2,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/= tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args index 09eff14e46..e56d48ac36 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qem= uxmlconfdata/s390-panic.s390x-latest.args index e020a9f467..c5e4c9245e 100644 --- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ -machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ --cpu gen15a-base,aen=3Don,vxpdeh=3Don,aefsi=3Don,diag318=3Don,csske=3Don,m= sa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa5=3Don,msa4=3Don,msa3=3Don,msa2= =3Don,msa1=3Don,sthyi=3Don,edat=3Don,deflate=3Don,etoken=3Don,vx=3Don,ap=3D= on,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2=3Don,esort=3Don,apft= =3Don,els=3Don,iep=3Don,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,gs=3Don,ppa15= =3Don,zpci=3Don,sea_esop2=3Don,te=3Don \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=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,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args b/te= sts/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args index f7bc39111f..72ca38c305 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -chardev socket,id=3Dchr-vu-fs0,path=3D/var/lib/libvirt/qemu/domain--1-QEM= UGuest1/fs0-fs.sock \ -device '{"driver":"vhost-user-fs-ccw","id":"fs0","chardev":"chr-vu-fs0","= tag":"mount_tag","devno":"fe.0.0001"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b= /tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args index 928686ebac..ed9714cec7 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args = b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args index 4fec97f50e..f7c7371648 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args index 9d2cd4e125..f56ba3b919 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.a= rgs b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args index fbb07325b1..935aa07144 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args @@ -25,9 +25,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":= "fe.0.0001"}' \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args b= /tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args index 4e186b3452..1da8f0ab68 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args @@ -25,9 +25,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-gpu-ccw","id":"video0","max_outputs":1,"devno":= "fe.0.0002"}' \ diff --git a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args b/tests= /qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args index 69bdfc8ac3..fe120c9b9c 100644 --- a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0= .0001"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args b/tes= ts/qemuxmlconfdata/watchdog-diag288.s390x-latest.args index bc848b8e82..f4f9ec15fb 100644 --- a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args @@ -26,9 +26,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ +-device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -storage","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"diag288","id":"watchdog0"}' \ -watchdog-action inject-nmi \ --=20 2.44.0