From nobody Tue Feb 10 04:03:20 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 --- ...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