From nobody Tue Jan 21 07:21:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 173686014466116.625427005074357; Tue, 14 Jan 2025 05:09:04 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 032F995B; Tue, 14 Jan 2025 08:09:03 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 204F517BF; Tue, 14 Jan 2025 08:08:05 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B148A1752; Tue, 14 Jan 2025 08:08:02 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F1884174F for ; Tue, 14 Jan 2025 08:08:01 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-fOVuM8ChPvSUb4eqXM3w5Q-1; Tue, 14 Jan 2025 08:08:00 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 424591955DE0 for ; Tue, 14 Jan 2025 13:07:59 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 902C7195608E for ; Tue, 14 Jan 2025 13:07:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736860081; h=from:from: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; bh=Yo73U8Sv5vRl/QEckvh20MlAtpK91uUNW6UJymLQfWM=; b=cLtEcfDHbshHdBoFL2mfY+erNwbIaWokWpPqETXlxbnBJK9dViyLMOK0dnBfwhuJtWjBj+ Lk+SYIiYBeIXx0SrWUnpLqGdoUiCL4RM+t1khRLgQjWXki35nU+grPnc4huqxxpkvnAqdo JDl+mUB+5bzuucN2hyAnwSNO5FUWymU= X-MC-Unique: fOVuM8ChPvSUb4eqXM3w5Q-1 X-Mimecast-MFC-AGG-ID: fOVuM8ChPvSUb4eqXM3w5Q From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 1/2] qemuxmlconftest: Switch s390-default-cpu-...-virtio-2.7 to virtio-2.9 Date: Tue, 14 Jan 2025 14:07:53 +0100 Message-ID: <377b83a67fef3ad8e63a2a6097fb53d535f1ddf9.1736859971.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ipmwfaeCMWtHbKr4hOwrAewRjdoZiXANIshz2w5Xweg_1736860079 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2B6WKPXYHZMOX4JRVBSWMYY7Y4BFB7KC X-Message-ID-Hash: 2B6WKPXYHZMOX4JRVBSWMYY7Y4BFB7KC X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1736860146144019000 Content-Type: text/plain; charset="utf-8"; x-default="true" In its upstream commit [1], qemu dropped s390-2.7 machine type, then in commit [2] the s390-2.8 machine type was dropped. Therefore, switch both tests to s390-2.9 which is still available (though deprecated). 1: https://gitlab.com/qemu-project/qemu/-/commit/3199c7ee76089fb6844f6b2bed= 1f5d3d99a7527c 2: https://gitlab.com/qemu-project/qemu/-/commit/66924fe36977d9d9e45ba3e0b6= e851ee170507f6 Signed-off-by: Michal Privoznik --- ... =3D> s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args} | 4 ++-- ...l =3D> s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml} | 4 ++-- ...virtio-2.7.xml =3D> s390-default-cpu-kvm-ccw-virtio-2.9.xml} | 2 +- ... =3D> s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args} | 2 +- ...l =3D> s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml} | 2 +- ...virtio-2.7.xml =3D> s390-default-cpu-tcg-ccw-virtio-2.9.xml} | 2 +- tests/qemuxmlconftest.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.s390x-la= test.args =3D> s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.args} (67%) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.s390x-la= test.xml =3D> s390-default-cpu-kvm-ccw-virtio-2.9.s390x-latest.xml} (86%) rename tests/qemuxmlconfdata/{s390-default-cpu-kvm-ccw-virtio-2.7.xml =3D>= s390-default-cpu-kvm-ccw-virtio-2.9.xml} (85%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.s390x-la= test.args =3D> s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.args} (94%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.s390x-la= test.xml =3D> s390-default-cpu-tcg-ccw-virtio-2.9.s390x-latest.xml} (92%) rename tests/qemuxmlconfdata/{s390-default-cpu-tcg-ccw-virtio-2.7.xml =3D>= s390-default-cpu-tcg-ccw-virtio-2.9.xml} (85%) diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390= x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s= 390x-latest.args similarity index 67% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x= -latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-l= atest.args index 0d44697425..c5fe3fa95f 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-lates= t.args @@ -10,9 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ +-machine s390-ccw-virtio-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel kvm \ --cpu host \ +-cpu gen16a-base,nnpa=3Don,aen=3Don,cmmnt=3Don,vxpdeh=3Don,aefsi=3Don,diag= 318=3Don,csske=3Don,mepoch=3Don,msa9=3Don,msa8=3Don,msa7=3Don,msa6=3Don,msa= 5=3Don,msa4=3Don,msa3=3Don,msa2=3Don,msa1=3Don,sthyi=3Don,edat=3Don,ri=3Don= ,deflate=3Don,edat2=3Don,etoken=3Don,vx=3Don,ipter=3Don,pai=3Don,paie=3Don,= mepochptff=3Don,ap=3Don,vxeh=3Don,vxpd=3Don,esop=3Don,msa9_pckmo=3Don,vxeh2= =3Don,esort=3Don,appv=3Don,apqi=3Don,apft=3Don,els=3Don,iep=3Don,appvi=3Don= ,apqci=3Don,cte=3Don,ais=3Don,bpb=3Don,ctop=3Don,gs=3Don,ppa15=3Don,zpci=3D= on,rdp=3Don,sea_esop2=3Don,beareh=3Don,te=3Don,cmm=3Don,vxpdeh2=3Don \ -m size=3D262144k \ -object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456= }' \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390= x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s3= 90x-latest.xml similarity index 86% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x= -latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-l= atest.xml index ae39e6277d..b21a01b568 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-lates= t.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.s390x-lates= t.xml @@ -5,10 +5,10 @@ 262144 1 - hvm + hvm - + destroy restart diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml = b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml similarity index 85% rename from tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml index a3c1804f57..b6cf53d1be 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.9.xml @@ -4,7 +4,7 @@ 262144 262144 - hvm + hvm destroy diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390= x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s= 390x-latest.args similarity index 94% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x= -latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-l= atest.args index 06b3f5733e..a3ff26fe79 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-lates= t.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \ --machine s390-ccw-virtio-2.7,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ +-machine s390-ccw-virtio-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backen= d=3Ds390.ram \ -accel tcg \ -cpu qemu \ -m size=3D262144k \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390= x-latest.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s3= 90x-latest.xml similarity index 92% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x= -latest.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-l= atest.xml index f4f9e724a9..2d26916fe5 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-lates= t.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.s390x-lates= t.xml @@ -5,7 +5,7 @@ 262144 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml = b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml similarity index 85% rename from tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml index 3451e9d81f..4f7b6ece9b 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.9.xml @@ -4,7 +4,7 @@ 262144 262144 - hvm + hvm destroy diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6a46bfc7a3..12a601b31b 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2922,8 +2922,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-3.1", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-kvm-pseries-4.2", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-default-cpu-tcg-pseries-4.2", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-2.7", "s390x= "); - DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-2.7", "s390x= "); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-2.9", "s390x= "); + DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-2.9", "s390x= "); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x= "); DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x= "); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-kvm-pc-4.2", "x86_64"); --=20 2.45.2