From nobody Mon Feb 9 07:19:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680258725; cv=none; d=zohomail.com; s=zohoarc; b=PoRBL1Oyug20oHtsBckwEIHykuECYKGf+ygJHBmRKQVUghMfLldM//oZj/qH8MSsLIVdPqXJBM+CUWtu9oQTGCFEyXYY5gUWS3bGPpEiApNi83Spco1gSCgM9OCCNm4oY5aENP1oM0GucR+FT/XZSH5isOuiIDc4qCMp1zjSBNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258725; 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=u5Y2mkdI5gtNPyhTpm+0f76l/ULtGtnia2Wsr5nMh3E=; b=Sj52qHvf4MM3pocpwJ0Yea5r+lxGmMLa9SeLwh6WKwXd9Ehn+NWBdBRxiUpFHd0YjQ88igZFlt/tsZegyt6lQwOOC5te74bg3KR/crKYv36npgdw6yYDMS4VlTyFyuwZqh0Qyehcuvf5oymyU7zyNW59V/ObrLWN5uZ0OyVQrOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680258725325341.0777445799454; Fri, 31 Mar 2023 03:32:05 -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-441-AlZrBlEEP3WFxpxtJKxdSA-1; Fri, 31 Mar 2023 06:30:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2D933857FB2; 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 E708FC15BBA; Fri, 31 Mar 2023 10:30:48 +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 B8DBE19466DF; 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 EAEC71946A4C for ; Fri, 31 Mar 2023 10:30:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CE8F6C15BBA; Fri, 31 Mar 2023 10:30:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D078C15BA0 for ; Fri, 31 Mar 2023 10:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258723; 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=u5Y2mkdI5gtNPyhTpm+0f76l/ULtGtnia2Wsr5nMh3E=; b=BZ0UI5sWO1F6UenbC87H1wMzjK9RVQTy5rxIoLdyiQvPkohXgCR4UeFgDJF1DFnUu3W8Qc lBT0/wO7gCE8K6hBupM9SzFK2vwPt4HmPGOFC5uhLijoaTg6VBm9ofUsgIgnx+hn9r5Dhn LgtUESQ5mL4+D4SuiZ3oGRHSi31wx0I= X-MC-Unique: AlZrBlEEP3WFxpxtJKxdSA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/7] qemuxml2argvtest: Remove obsolete negative tests Date: Fri, 31 Mar 2023 12:30:38 +0200 Message-Id: <6eaa0828f90f042f1b692b4890de8459c5178f0c.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.8 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: 1680258726172100001 Content-Type: text/plain; charset="utf-8" The 'hostdev-subsys-mdev-vfio-ccw', 'hostdev-vfio-zpci', and 'hostdev-vfio-zpci-autogenerate-fids' test cases have negative versions which are invoked without capabilities. This does not make sense going forward as the tests are going to be switched to real capabilities. Remove them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err | 1 - .../qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err | 1 - tests/qemuxml2argvdata/hostdev-vfio-zpci.err | 1 - tests/qemuxml2argvtest.c | 5 ----- 4 files changed, 8 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-f= ids.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err b/test= s/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err deleted file mode 100644 index 88c13f62b6..0000000000 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: VFIO CCW device assignment is not supported by = this version of QEMU diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err= b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err deleted file mode 100644 index a0ca4fba5d..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err +++ /dev/null @@ -1 +0,0 @@ -XML error: No PCI buses available diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err b/tests/qemuxml2a= rgvdata/hostdev-vfio-zpci.err deleted file mode 100644 index 842693b4e0..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: This QEMU binary doesn't support zPCI diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4fada9725f..dbf8509f6d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1750,8 +1750,6 @@ mymain(void) DO_TEST("hostdev-vfio-zpci", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI); 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"); @@ -1764,8 +1762,6 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); @@ -1781,7 +1777,6 @@ mymain(void) 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_NOCAPS("hostdev-subsys-mdev-vfio-ccw"); 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", --=20 2.39.2 From nobody Mon Feb 9 07:19:11 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 Reviewed-by: J=C3=A1n Tomko --- ...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 From nobody Mon Feb 9 07:19:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680258657; cv=none; d=zohomail.com; s=zohoarc; b=QW1pHgVkKbiLguSqkOoB5yxAISlQo8cM323lA12XT1ufMBqb+1bLb1RMKb1/JYQGHFAg+B4R93hsA/XIdyYEpFO8FFdUbColP6JVmZNxE+5r9Y+YLpEACD5pXzj3AmZb7pvE1ZzUo9zg41L4xCzolSfxsBN00CXjaNCSKW5/FeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258657; 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=J04qs/vEwMkGCiXhU5fwg9Ihil3vlVtn7xR2rEEvy1Q=; b=MkDbtnAoNenyCdSurSAEBrdQbTr1ExUufW7a7/lvzX2vKGrb+/WD71AsThaAm4FCBL5xzLgMeMrv71b+fWtX1C/opDbWYLIovs5rhekyCR7najWyhz8OQHKAcst+eyAs1MrYMcvLLva7z35wHt40FK/zsEnIQuts8NWyP/Bh2jM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680258657798905.7445165707462; Fri, 31 Mar 2023 03:30:57 -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-379-pKHAneXrP6aaCU7vQWnTeQ-1; Fri, 31 Mar 2023 06:30:53 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 53DB2382C97D; Fri, 31 Mar 2023 10:30:50 +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 41755492B00; Fri, 31 Mar 2023 10:30:50 +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 36CD019465BD; Fri, 31 Mar 2023 10:30:50 +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 C17E61946A44 for ; Fri, 31 Mar 2023 10:30:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A5C1AC15BB8; Fri, 31 Mar 2023 10:30:48 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3428AC15BBA for ; Fri, 31 Mar 2023 10:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258656; 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=J04qs/vEwMkGCiXhU5fwg9Ihil3vlVtn7xR2rEEvy1Q=; b=FccSvLSeQ154nRQygG8TCM7GZfvWF+8aPOfRlfYMUgU7HJGt8jaIZQajPKfBG5I0fUbHtG lQ0Ksa+aTzPTYXE+DOGVRxTwwrCL0l2hxMb3k5IGmjlJ3oLRN/7rYvcXsnkeU8nB0+3u6E Lye3R1f834RmgUIF5x0SWpH1FgTGUYk= X-MC-Unique: pKHAneXrP6aaCU7vQWnTeQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/7] qemuxml2argvtest: Modernize all s390 'loadparm' tests Date: Fri, 31 Mar 2023 12:30:40 +0200 Message-Id: <1dbd2160bc6a1b53b4be4987d99a28a9ddb24bce.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.9 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: 1680258659686100001 Content-Type: text/plain; charset="utf-8" Use latest caps for the tests. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...ne-loadparm-multiple-disks-nets-s390.s390x-latest.args} | 7 +++++-- ...90.args =3D> machine-loadparm-net-s390.s390x-latest.args} | 7 +++++-- ...m-s390.args =3D> machine-loadparm-s390.s390x-latest.args} | 7 +++++-- tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 18 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{machine-loadparm-multiple-disks-nets-s390.a= rgs =3D> machine-loadparm-multiple-disks-nets-s390.s390x-latest.args} (81%) rename tests/qemuxml2argvdata/{machine-loadparm-net-s390.args =3D> machine= -loadparm-net-s390.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{machine-loadparm-s390.args =3D> machine-loa= dparm-s390.s390x-latest.args} (74%) diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s3= 90.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.= s390x-latest.args similarity index 81% rename from tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s39= 0.args rename to tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.= s390x-latest.args index f1830a47b1..04c79bdb69 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390= x-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,loadparm=3DSYSTEM= 1 \ +-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,loadparm=3DSYSTEM1 \ -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 \ @@ -36,4 +38,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device virtio-net-ccw,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:42:36= ,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/machine-loadparm-net-s390.args b/tests/= qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args similarity index 70% rename from tests/qemuxml2argvdata/machine-loadparm-net-s390.args rename to tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args index 8df9e06be9..aeff83148f 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.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,loadparm=3D2 \ +-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,loadparm=3D2 \ -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 virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:54= ,bootindex=3D1,devno=3Dfe.0.0000 \ -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/machine-loadparm-s390.args b/tests/qemu= xml2argvdata/machine-loadparm-s390.s390x-latest.args similarity index 74% rename from tests/qemuxml2argvdata/machine-loadparm-s390.args rename to tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args index 52b11be4ea..acd7ab845a 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.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,loadparm=3D2 \ +-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,loadparm=3D2 \ -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 \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b1bda4e4d7..9fcd0314b6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2556,10 +2556,10 @@ mymain(void) 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"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-s390", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-net-s390", "s390x"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); - DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", = "s390x"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid"); --=20 2.39.2 From nobody Mon Feb 9 07:19:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1680258665; cv=none; d=zohomail.com; s=zohoarc; b=KAZdHpVx+TZkYp4nv3gMGd0z/Yrb879sBnvHu2JGuZtLBkTckbegsKRyN2Jn0ddf9khagfLp3sdmuQDuJ2AzBQ9BekpPDrGmVJYZk9HCo1sL0zIeEcFmx0aLmE8ZbNERXI0hxwrfS5qt1bnLaxVTzeC8t8ucWxjwBoUL2kn9pAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258665; 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=a27TlDtvyqvQJ8epT3O1F45n4EfNwdbarmYUz5gDnqE=; b=jw2KeMkjoVKKvvCGQQy39mzKPfPyGaAcnoD+aCR0ajUgJZEXQ0SMmu71Dd9WPAznIpYNVuZQdPqQCZ4C5WLciaXmjNOF+8jKb9XNxaPPSZDEuZ/SfsgV6XbTcCH+RZlGgvUjdKE5R/ebsjPhgoi7gyxZqMYjNdZ9l184vj1Zdow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1680258665233171.24618086799433; Fri, 31 Mar 2023 03:31:05 -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-145-bwM8JiBxMdGTY_KQWaQ4ZQ-1; Fri, 31 Mar 2023 06:30:58 -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 02D7529A8AEB; Fri, 31 Mar 2023 10:30:56 +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 E3469492B00; Fri, 31 Mar 2023 10:30:55 +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 C4EDC1946A44; Fri, 31 Mar 2023 10:30:55 +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 96AF619465BC for ; Fri, 31 Mar 2023 10:30:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 89035C15BA0; Fri, 31 Mar 2023 10:30:49 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D585C15BC0 for ; Fri, 31 Mar 2023 10:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258662; 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=a27TlDtvyqvQJ8epT3O1F45n4EfNwdbarmYUz5gDnqE=; b=bSlTXaJtcBjTbNoYVOIOBJD85UKNZx4bgQaqMTjtd/+4atAMzKfYQi7xvsnMpussTdxrL+ ITLRSPC/QSgAdxYy0SkXtKHDY3plRKzp8PG8T3Dr5lFpYELf/5Y1PTEiB434OsMDvWBnal CK1UltFsR7H6r3l12IQMc7ZbxwWbopQ= X-MC-Unique: bwM8JiBxMdGTY_KQWaQ4ZQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/7] qemuxml2argvtest: Modernize s390 cpu tests Date: Fri, 31 Mar 2023 12:30:41 +0200 Message-Id: <70c54d7567b69c990b2b7875a0ce1544dfae8273.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: 1680258665755100003 Content-Type: text/plain; charset="utf-8" Use real capabilities for the CPU test. The negative test case for QEMUs without QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION is removed as the feature is now supported by all supported qemu versions. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/cpu-s390-features.err | 1 - ...0-features.args =3D> cpu-s390-features.s390x-latest.args} | 6 ++++-- ...pu-s390-zEC12.args =3D> cpu-s390-zEC12.s390x-latest.args} | 6 ++++-- tests/qemuxml2argvtest.c | 7 ++----- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err rename tests/qemuxml2argvdata/{cpu-s390-features.args =3D> cpu-s390-featur= es.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args =3D> cpu-s390-zEC12.s39= 0x-latest.args} (67%) diff --git a/tests/qemuxml2argvdata/cpu-s390-features.err b/tests/qemuxml2a= rgvdata/cpu-s390-features.err deleted file mode 100644 index 5f078fc8e1..0000000000 --- a/tests/qemuxml2argvdata/cpu-s390-features.err +++ /dev/null @@ -1 +0,0 @@ -internal error: CPU features not supported by hypervisor for s390x archite= cture diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2= argvdata/cpu-s390-features.s390x-latest.args similarity index 68% rename from tests/qemuxml2argvdata/cpu-s390-features.args rename to tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args index 69e705e895..d6c1d6e278 100644 --- a/tests/qemuxml2argvdata/cpu-s390-features.args +++ b/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ /usr/bin/qemu-system-s390x \ -name guest=3Dguest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest1/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-guest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu zEC12,dfppc=3Don,stckf=3Doff \ -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 \ @@ -26,4 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -no-shutdown \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2arg= vdata/cpu-s390-zEC12.s390x-latest.args similarity index 67% rename from tests/qemuxml2argvdata/cpu-s390-zEC12.args rename to tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args index 1a33d6bcca..8ad4fd90ce 100644 --- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args +++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ /usr/bin/qemu-system-s390x \ -name guest=3Dguest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest1/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-guest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=3Doff,dump-guest-core=3Doff,memory-backend=3D= s390.ram \ -accel kvm \ -cpu zEC12 \ -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 \ @@ -26,4 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -no-shutdown \ -boot strict=3Don \ -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 9fcd0314b6..68772d12ab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1871,11 +1871,8 @@ mymain(void) DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); - qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM); - DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_= EXPANSION); - DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM); - qemuTestSetHostArch(&driver, VIR_ARCH_NONE); + DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); qemuTestSetHostCPU(&driver, driver.hostarch, qemuTestGetCPUDef(QEMU_CP= U_DEF_HASWELL)); DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); --=20 2.39.2 From nobody Mon Feb 9 07:19:11 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 Reviewed-by: J=C3=A1n Tomko --- ...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 From nobody Mon Feb 9 07:19:11 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=1680258661; cv=none; d=zohomail.com; s=zohoarc; b=HzaTUtKrUG/mEnGkFRhh9cNu0B8xXCaJyP0bMcUQo4Hw59RHMQWSGjI8hEnwhu4ut8KxonKqHfSihSkm+vWUkLViyEDDgM70MCnPb9rHazjhA3c/8dEVsFyBkbE3CqZUYv2CQ4LSZfc2w3/YOrJ1Gsfx2VQTlUMLZaGmaR31GRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680258661; 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=c3K5VkmCCGxu8n1FsIAe7KDXt596d6vjR4sP4uxXAYg=; b=nX+PQoLJ6jX1EAu8NxJjWqXIRpNlMYQFQTEPtO64/42t1419sF+jUVrpvFBE6HEXFPv80GOgIhtbxpq3jGfl7pPwGe58hoI15/ALa3mpuXtEJ7uDTRfnb+BsbZ8Z37C4gtJqTv1o605CpQxYOwuCijlKyf/tSUH/WZwu9dPisQE= 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 1680258661810267.3773816776102; Fri, 31 Mar 2023 03:31:01 -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-640-ok859jPsMPKgZjK5nEt7pQ-1; Fri, 31 Mar 2023 06:30:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97EAF1C08798; Fri, 31 Mar 2023 10:30:53 +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 827621121314; Fri, 31 Mar 2023 10:30:53 +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 7836119465BD; Fri, 31 Mar 2023 10:30:53 +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 88C2D19465BC for ; Fri, 31 Mar 2023 10:30:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5C9DAC15BB8; Fri, 31 Mar 2023 10:30:51 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDE1BC15BA0 for ; Fri, 31 Mar 2023 10:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680258660; 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=c3K5VkmCCGxu8n1FsIAe7KDXt596d6vjR4sP4uxXAYg=; b=T9b4sHjF6R5aeU/YtUoR6lJOJu+NwqJ659lKW4tuHCvWJl7DtGtIBqfCLaVFVFvNEpYzOu S9cII0D4BP6CN6TFjxTS8w2GZiOvMtTN9Ow1++2xk6SKRKVeIAhf0I0gVA1yInU4Yl6thd FDhtYrTYbEjGqIQri40YeOsUlxCbQOY= X-MC-Unique: ok859jPsMPKgZjK5nEt7pQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/7] qemuxml2xmltest: Convert all s390 test cases to real capabilities Date: Fri, 31 Mar 2023 12:30:43 +0200 Message-Id: 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.3 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: 1680258663931100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...=3D> disk-virtio-s390-zpci.s390x-latest.xml} | 3 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} | 4 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} | 4 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} | 4 + ...o-zpci-autogenerate-fids.s390x-latest.xml} | 3 + ...o-zpci-autogenerate-uids.s390x-latest.xml} | 3 + ...v-vfio-zpci-autogenerate.s390x-latest.xml} | 3 + ...dev-vfio-zpci-boundaries.s390x-latest.xml} | 3 + ...vfio-zpci-ccw-memballoon.s390x-latest.xml} | 1 + ...io-zpci-multidomain-many.s390x-latest.xml} | 3 + ...xml =3D> hostdev-vfio-zpci.s390x-latest.xml} | 3 + ....xml =3D> input-virtio-ccw.s390x-latest.xml} | 4 + ...multiple-disks-nets-s390.s390x-latest.xml} | 4 + ...ml =3D> s390-panic-missing.s390x-latest.xml} | 4 + ...=3D> s390-panic-no-address.s390x-latest.xml} | 4 + ...-panic.xml =3D> s390-panic.s390x-latest.xml} | 2 + ...l-2.xml =3D> s390-serial-2.s390x-latest.xml} | 4 + ...l =3D> s390-serial-console.s390x-latest.xml} | 4 + ...nsole.xml =3D> s390-serial.s390x-latest.xml} | 4 + ... =3D> vhost-vsock-ccw-auto.s390x-latest.xml} | 4 + .../vhost-vsock-ccw.s390x-latest.xml | 37 +++++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... =3D> video-virtio-gpu-ccw.s390x-latest.xml} | 4 + tests/qemuxml2xmltest.c | 81 ++++++------------- 25 files changed, 137 insertions(+), 58 deletions(-) rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml =3D> disk-virti= o-s390-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml =3D> host= dev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml =3D> host= dev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml =3D> hos= tdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml = =3D> hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml = =3D> hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml =3D> h= ostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml =3D> hos= tdev-vfio-zpci-boundaries.s390x-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml =3D>= hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml = =3D> hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml =3D> hostdev-vfio-z= pci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml =3D> input-virtio-cc= w.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390= .xml =3D> machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml =3D> s390-panic-mi= ssing.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml =3D> s390-panic= -no-address.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{s390-panic.xml =3D> s390-panic.s390x-late= st.xml} (90%) rename tests/qemuxml2xmloutdata/{s390-serial-2.xml =3D> s390-serial-2.s390= x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-serial.xml =3D> s390-serial-console.= s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{s390-serial-console.xml =3D> s390-serial.= s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml =3D> vhost-vsock= -ccw-auto.s390x-latest.xml} (87%) create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.x= ml delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml =3D> video-= virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml =3D> video-virti= o-gpu-ccw.s390x-latest.xml} (89%) diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml b/tests/qem= uxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml rename to tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml index bf1fe681be..c98bf78160 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu + destroy restart diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tes= ts/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest= .xml index 95eff7ead6..efd3027d3e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ hvm + + qemu + destroy restart @@ -23,6 +26,7 @@
+