From nobody Mon Feb 9 15:11:00 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=1680258659; cv=none; d=zohomail.com; s=zohoarc; b=X9oDktvuMt7w9ac69MtK2k63ZUmZWdu8SZ32u0zrGG7iW62zV+wT4rCDSW74MurjfxmVc34OTGOhmWQOfL6HNsGIufstgcFS/fi4u1ebTAmmJLDhIkyK4zjHCjtTgh6P2Uapj/sXdNyPsdRWJN1YZ42VIW/AfRG6IIynJ94ofJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258659; 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=eOtH1T229pU3lyqQj2BQKITWLpYlsXtGQGwZUbAo3n8=; b=inJFpCbxOtcOH1HBsZFDhgtpO3GEAVCUXWSPqk070gSQWWXh9JSy1lYua2DicTkUdZP50V0u4ogYd2ufHhHMJlurAf2ZkJfg12m2RQ6Uloy+N6RHse8j5vGYkLNHgsA17rj3d3ldPHkxOBoclbp9zM4Cy73ELradNp0iTA0RcSc= 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 1680258659401400.7889245627679; Fri, 31 Mar 2023 03:30:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-MEZAjF5CNqWZa6P5jUkN5g-1; Fri, 31 Mar 2023 06:30:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9275E100DEB8; Fri, 31 Mar 2023 10:30:49 +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 46D52202717E; Fri, 31 Mar 2023 10:30:49 +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 EE91419465BC; Fri, 31 Mar 2023 10:30:48 +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 EE67819465BC for ; Fri, 31 Mar 2023 10:30:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D4EFBC15BC0; Fri, 31 Mar 2023 10:30:47 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EDFCC15BA0 for ; Fri, 31 Mar 2023 10:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258658; 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=eOtH1T229pU3lyqQj2BQKITWLpYlsXtGQGwZUbAo3n8=; b=ivNDUHy0pt0A6cVJwW0y0MmTH1RgCQNgfp8YCBWEhcP8RL1M+AD/BoLFc/RIHD9IejHGaX hft5lpKF0Pm6kXg66Zj6S0IACT4/f4zS0zJwxj2o+Q+VPN6omAULOeIbpLAklRsObnCwSi k9sjm6WSo3m9fBwrqQTEVGaw7gnRjvY= X-MC-Unique: MEZAjF5CNqWZa6P5jUkN5g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/7] qemuxml2argvtest: Modernize all s390 'keywrap' tests Date: Fri, 31 Mar 2023 12:30:39 +0200 Message-Id: <4bd9c0e995221eb0e3928d0a6e409cc52b7052db.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.4 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: 1680258659816100003 Content-Type: text/plain; charset="utf-8" Use latest caps for the tests. Signed-off-by: Peter Krempa --- ...hine-aeskeywrap-off-cap.s390x-latest.args} | 7 +++- ...ine-aeskeywrap-off-caps.s390x-latest.args} | 7 +++- ...chine-aeskeywrap-on-cap.s390x-latest.args} | 7 +++- ...hine-aeskeywrap-on-caps.s390x-latest.args} | 7 +++- ...hine-deakeywrap-off-cap.s390x-latest.args} | 7 +++- ...ine-deakeywrap-off-caps.s390x-latest.args} | 7 +++- ...chine-deakeywrap-on-cap.s390x-latest.args} | 7 +++- ...hine-deakeywrap-on-caps.s390x-latest.args} | 7 +++- .../machine-keywrap-none-caps.args | 31 --------------- ...achine-keywrap-none-caps.s390x-latest.args | 34 +++++++++++++++++ .../machine-keywrap-none.args | 31 --------------- .../machine-keywrap-none.s390x-latest.args | 34 +++++++++++++++++ tests/qemuxml2argvtest.c | 38 +++++-------------- 13 files changed, 118 insertions(+), 106 deletions(-) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-cap.args =3D> machin= e-aeskeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-caps.args =3D> machi= ne-aeskeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-cap.args =3D> machine= -aeskeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-caps.args =3D> machin= e-aeskeywrap-on-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-cap.args =3D> machin= e-deakeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-caps.args =3D> machi= ne-deakeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-cap.args =3D> machine= -deakeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-caps.args =3D> machin= e-deakeywrap-on-caps.s390x-latest.args} (77%) delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-= latest.args delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.s390x-lates= t.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests= /qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.ar= gs index 95602afc03..9fb612a69d 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.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,aes-key-wrap=3Doff,dump-guest-core=3Dof= f \ +-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,aes-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/test= s/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.a= rgs index 95602afc03..9fb612a69d 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.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,aes-key-wrap=3Doff,dump-guest-core=3Dof= f \ +-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,aes-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/= qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args index 98d10f07e1..9d75fc8a57 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.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,aes-key-wrap=3Don,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,aes-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests= /qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.ar= gs index 98d10f07e1..9d75fc8a57 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.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,aes-key-wrap=3Don,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,aes-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests= /qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args rename to tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.ar= gs index 75328814b5..fe8a1a2545 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.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,dea-key-wrap=3Doff,dump-guest-core=3Dof= f \ +-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,dea-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/test= s/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args rename to tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.a= rgs index 75328814b5..fe8a1a2545 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.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,dea-key-wrap=3Doff,dump-guest-core=3Dof= f \ +-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,dea-key-wrap=3Doff,dump-guest-core=3Dof= f,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/= qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args rename to tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args index edb16b7716..b40a7fd10d 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.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,dea-key-wrap=3Don,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,dea-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests= /qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args rename to tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.ar= gs index edb16b7716..b40a7fd10d 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.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,dea-key-wrap=3Don,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,dea-key-wrap=3Don,dump-guest-core=3Doff= ,memory-backend=3Ds390.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 \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/= qemuxml2argvdata/machine-keywrap-none-caps.args deleted file mode 100644 index 0371cc1e24..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.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 \ --accel tcg \ --m 214 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --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 virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.= args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args new file mode 100644 index 0000000000..c23e11cb28 --- /dev/null +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-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 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-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 virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemux= ml2argvdata/machine-keywrap-none.args deleted file mode 100644 index 0371cc1e24..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.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 \ --accel tcg \ --m 214 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --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 virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args = b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args new file mode 100644 index 0000000000..c23e11cb28 --- /dev/null +++ b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-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 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-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 virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-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 dbf8509f6d..b1bda4e4d7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2545,34 +2545,16 @@ mymain(void) DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); - DO_TEST("machine-aeskeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-keywrap-none-caps", - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("machine-keywrap-none", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-off-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-off-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-on-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-on-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-off-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-off-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none", "s390x"); DO_TEST_NOCAPS("machine-loadparm-s390"); DO_TEST_NOCAPS("machine-loadparm-net-s390"); --=20 2.39.2