From nobody Mon Feb 9 12:25:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1680258739; cv=none; d=zohomail.com; s=zohoarc; b=XCUm8pH85Z4UxL/EGy6eJhVahdN+MORWZv+QmvSuB8jRHTYXHUyHdFFaNXGwGJeeEgGcDjmMnQ0Oe8/1yPm3qAPBIDRgNCUfNLYp1Ms5bHyeu98qFPt9XbPzCSGQn6DSrqDCpH9OSvMRv8Q+HiS199+8zDY4BPGoH/5Igbvvrn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258739; 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=KlaTTqub/6me/Q7/VyvJso0i6Z1nKR/gl3SXeRjDdMk=; b=V9ozLPXt3/bIRahvYo9Wmy0w2mCtt09d1I6er6Xg3dhr1M2SvNObKWHpvZpNFhnOUHosTz73U2lBF6pG5HEQDcz2cOmP6ZctuNUrh/dDqwwhnkmxJ4EmJo+Ytd2PXRe6AoA1nJYPKchdPWZVPFpT3zqA753pkQ4LnVmCtybNOfw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 168025873924426.908160977557145; Fri, 31 Mar 2023 03:32:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-RCD1xrb7PjybNc6ORFROkg-1; Fri, 31 Mar 2023 06:30:55 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4E3A1C01B50; Fri, 31 Mar 2023 10:30:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7530B492B01; Fri, 31 Mar 2023 10:30:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 40A9619466DF; Fri, 31 Mar 2023 10:30:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9F12719465BD for ; Fri, 31 Mar 2023 10:30:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8266EC15BC0; Fri, 31 Mar 2023 10:30:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id D926BC15BB8 for ; Fri, 31 Mar 2023 10:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258738; 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=KlaTTqub/6me/Q7/VyvJso0i6Z1nKR/gl3SXeRjDdMk=; b=T4BGKFVPt5YgyYgr8PibE5oE9d9X0kC1pumLfJ8xEDP3gUkLs9XSlethxiq+HPCzee13Gt PIMGMOkTs/kxW1qxVV77yO29aJJbecWGPPli0dsf95lu+mAHRFqs0zcLudTZ8oMZjJi0ja H/H4+8P1BJsJ3pf3FLnxI2eZbvsI9IE= X-MC-Unique: RCD1xrb7PjybNc6ORFROkg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/7] qemuxml2argvtest: Convert rest of s390 tests to real caps Date: Fri, 31 Mar 2023 12:30:42 +0200 Message-Id: <2600fc9f8b63d8571c566e6877ea5f4cefc2a60e.1680258522.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1680258740448100001 Content-Type: text/plain; charset="utf-8" Convert the rest of the outstanding tests to use real capabilities. Signed-off-by: Peter Krempa --- ...dev-scsi-vhost-scsi-ccw.s390x-latest.args} | 7 +- ...io-ccw-duplicate-address.s390x-latest.err} | 0 ...vfio-ccw-invalid-address.s390x-latest.err} | 0 ...ev-vfio-zpci-boundaries.s390x-latest.args} | 7 +- ...tdev-vfio-zpci-duplicate.s390x-latest.err} | 0 ...stdev-vfio-zpci-set-zero.s390x-latest.err} | 0 ...v-vfio-zpci-uid-set-zero.s390x-latest.err} | 0 ...gs =3D> hostdev-vfio-zpci.s390x-latest.args} | 7 +- ...rgs =3D> input-virtio-ccw.s390x-latest.args} | 7 +- ....err =3D> s390-no-parallel.s390x-latest.err} | 0 ...rr =3D> s390-panic-address.s390x-latest.err} | 0 ...s =3D> s390-panic-missing.s390x-latest.args} | 7 +- ...> s390-panic-no-address.s390x-latest.args} | 7 +- ...2.args =3D> s390-serial-2.s390x-latest.args} | 7 +- ... =3D> s390-serial-console.s390x-latest.args} | 7 +- ...ial.args =3D> s390-serial.s390x-latest.args} | 7 +- ...=3D> video-virtio-gpu-ccw.s390x-latest.args} | 7 +- tests/qemuxml2argvtest.c | 72 ++++++------------- 18 files changed, 71 insertions(+), 71 deletions(-) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-ccw.args =3D> hostd= ev-scsi-vhost-scsi-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-duplicate-addr= ess.err =3D> hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.er= r} (100%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-invalid-addres= s.err =3D> hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err} (= 100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-boundaries.args =3D> host= dev-vfio-zpci-boundaries.s390x-latest.args} (75%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-duplicate.err =3D> hostde= v-vfio-zpci-duplicate.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-set-zero.err =3D> hostdev= -vfio-zpci-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-uid-set-zero.err =3D> hos= tdev-vfio-zpci-uid-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci.args =3D> hostdev-vfio-zp= ci.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{input-virtio-ccw.args =3D> input-virtio-ccw= .s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{s390-no-parallel.err =3D> s390-no-parallel.= s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-address.err =3D> s390-panic-addr= ess.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-missing.args =3D> s390-panic-mis= sing.s390x-latest.args} (72%) rename tests/qemuxml2argvdata/{s390-panic-no-address.args =3D> s390-panic-= no-address.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-2.args =3D> s390-serial-2.s390x= -latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-console.args =3D> s390-serial-c= onsole.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{s390-serial.args =3D> s390-serial.s390x-lat= est.args} (69%) rename tests/qemuxml2argvdata/{video-virtio-gpu-ccw.args =3D> video-virtio= -gpu-ccw.s390x-latest.args} (77%) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.a= rgs index b17965990d..83b71ed272 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest2/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vhost-scsi-ccw,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,devno=3Dfe.0.0002 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0003 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-= address.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate= -address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-a= ddress.err rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-add= ress.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-ad= dress.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-add= ress.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-add= ress.err rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-addre= ss.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tes= ts/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args similarity index 75% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.= args index 3b7ef3e211..c4af2edd9e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device zpci,uid=3D1,fid=3D0,target=3Dhostdev1,id=3Dzpci1 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.err b/tests= /qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.e= rr diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.err b/tests/= qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.err b/te= sts/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-lates= t.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2= argvdata/hostdev-vfio-zpci.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args index e7ece11286..4ba14c181e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device zpci,uid=3D25,fid=3D31,target=3Dhostdev0,id=3Dzpci25 \ -device vfio-pci,host=3D0000:00:00.0,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x8 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2a= rgvdata/input-virtio-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/input-virtio-ccw.args rename to tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args index 0b8596fbd0..013d2128ee 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device virtio-tablet-ccw,id=3Dinput2,devno=3Dfe.0.0004 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-no-parallel.err b/tests/qemuxml2ar= gvdata/s390-no-parallel.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-no-parallel.err rename to tests/qemuxml2argvdata/s390-no-parallel.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-panic-address.err b/tests/qemuxml2= argvdata/s390-panic-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-address.err rename to tests/qemuxml2argvdata/s390-panic-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml= 2argvdata/s390-panic-missing.s390x-latest.args similarity index 72% rename from tests/qemuxml2argvdata/s390-panic-missing.args rename to tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args index 594f31b8c8..7ea849c458 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device virtconsole,devno=3Dfe.0.0001,chardev=3Dcharconsole0,id=3Dconsole0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0002 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemu= xml2argvdata/s390-panic-no-address.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/s390-panic-no-address.args rename to tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args index adbab9bf3a..11ab53aaa1 100644 --- a/tests/qemuxml2argvdata/s390-panic-no-address.args +++ b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argv= data/s390-serial-2.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/s390-serial-2.args rename to tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args index 54856748a2..45ee168022 100644 --- a/tests/qemuxml2argvdata/s390-serial-2.args +++ b/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev pty,id=3Dcharserial1 \ -device sclplmconsole,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxm= l2argvdata/s390-serial-console.s390x-latest.args similarity index 69% rename from tests/qemuxml2argvdata/s390-serial-console.args rename to tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args index 37b2de24fc..6ddeea60d9 100644 --- a/tests/qemuxml2argvdata/s390-serial-console.args +++ b/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev pty,id=3Dcharserial0 \ -device sclpconsole,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvda= ta/s390-serial.s390x-latest.args similarity index 69% rename from tests/qemuxml2argvdata/s390-serial.args rename to tests/qemuxml2argvdata/s390-serial.s390x-latest.args index 37b2de24fc..6ddeea60d9 100644 --- a/tests/qemuxml2argvdata/s390-serial.args +++ b/tests/qemuxml2argvdata/s390-serial.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev pty,id=3Dcharserial0 \ -device sclpconsole,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemux= ml2argvdata/video-virtio-gpu-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw.args rename to tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args index 87c7dc9d3a..646d28fade 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ /usr/bin/qemu-system-s390x \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff \ +-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 \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264= }' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0002 \ -device virtio-gpu-ccw,id=3Dvideo1,max_outputs=3D1,devno=3Dfe.0.0003 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 68772d12ab..2e72ebf8e3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1747,27 +1747,16 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-va= lid-fid", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"= ); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-uids", "s390x= "); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids", "s390x= "); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-uid-set-zero", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-boundaries", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-uid-set-zero",= "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-boundaries", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", "s= 390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", "s3= 90x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI); @@ -1775,17 +1764,12 @@ mymain(void) DO_TEST_NOCAPS("pci-rom-disabled-invalid"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); - DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", - "s390x"); - DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", - QEMU_CAPS_DEVICE_VFIO_CCW); - DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", - QEMU_CAPS_DEVICE_VFIO_CCW); - - DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", - "s390x"); - DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot= -fail", - "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-dup= licate-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-inv= alid-address", "s390x"); + + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot= -fail", "s390x"); DO_TEST_FULL("restore-v2", "", ARG_MIGRATE_FROM, "exec:cat", @@ -2121,16 +2105,13 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); - DO_TEST_NOCAPS("s390-panic-no-address"); - DO_TEST_PARSE_ERROR_NOCAPS("s390-panic-address"); - DO_TEST_NOCAPS("s390-panic-missing"); - DO_TEST_PARSE_ERROR_NOCAPS("s390-no-parallel"); - DO_TEST("s390-serial", QEMU_CAPS_DEVICE_SCLPCONSOLE); - DO_TEST("s390-serial-2", - QEMU_CAPS_DEVICE_SCLPCONSOLE, - QEMU_CAPS_DEVICE_SCLPLMCONSOLE); - DO_TEST("s390-serial-console", - QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-missing", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-no-parallel", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x"); DO_TEST_CAPS_ARCH_LATEST("ppc-dtb", "ppc"); DO_TEST_CAPS_ARCH_LATEST("ppce500-serial", "ppc"); @@ -2331,8 +2312,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x"); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -2692,18 +2672,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size"); - DO_TEST("video-virtio-gpu-ccw", - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); - - DO_TEST("input-virtio-ccw", - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, - QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, - QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("input-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); --=20 2.39.2