From nobody Tue Jan 21 07:24:51 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 1737026783917940.6394998536899; Thu, 16 Jan 2025 03:26:23 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5036D1995; Thu, 16 Jan 2025 06:26:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 184B91964; Thu, 16 Jan 2025 06:25:21 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 302E61927; Thu, 16 Jan 2025 06:25:16 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 6A11C1928 for ; Thu, 16 Jan 2025 06:25:15 -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-53-RytmVuXoO7m-ZycD7lTyjw-1; Thu, 16 Jan 2025 06:25:13 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 76875196F309 for ; Thu, 16 Jan 2025 11:25:11 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A3B2B30044C6 for ; Thu, 16 Jan 2025 11:25:10 +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=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, 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=1737026715; 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=fL7Nya6g8Ht4uJ5EnD4nwd98cnixK6l07CyVJNSvwBc=; b=J+k+mH7/9vNuHIzQmz8IdlWJXHxiz3wB524t4hzBxkueVhq1h+qT8OdwBZpBAFNqR+a8KM xu+Z5h8uyV3Anh69BOfYHgUiBEiQppEuFADegWTOXXXOfFl/sNtz0WF9IgldTRWhFXfs1s y0jt0LtWfhqaAXgJIOOpAIizEMlYYT8= X-MC-Unique: RytmVuXoO7m-ZycD7lTyjw-1 X-Mimecast-MFC-AGG-ID: RytmVuXoO7m-ZycD7lTyjw From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH v2 1/2] qemuxmlconftest: Drop s390-default-cpu-...ccw-virtio-2.7 test cases Date: Thu, 16 Jan 2025 12:25:05 +0100 Message-ID: <9c24d2fbf594149fc86dea79e8aee46233b1fff1.1737026557.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: A-Y3grw4pEC9mD9yMU9KaoW9pimsM_-_tPh-Uq1jPPg_1737026713 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6SPDJHXC5YWINWN34IPKA2PRPOVOPQ3R X-Message-ID-Hash: 6SPDJHXC5YWINWN34IPKA2PRPOVOPQ3R 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: 1737026784690019000 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. But as Thomas Huth pointed out, any machine type that's older than 6 years is subject to removal [3]. This means, any machine type older than 4.1 is going to be removed eventually. We have two test cases that assumes existence of 2.7 machine type. While they could be switched to 4.1 machine type, we also have another test case that already check 4.2 machine type. Therefore, just drop the 2.7 ones. 1: https://gitlab.com/qemu-project/qemu/-/commit/3199c7ee76089fb6844f6b2bed= 1f5d3d99a7527c 2: https://gitlab.com/qemu-project/qemu/-/commit/66924fe36977d9d9e45ba3e0b6= e851ee170507f6 3: https://gitlab.com/qemu-project/qemu/-/commit/ce80c4fa6ff0f5c379bba7db74= d04593e9fb12f2 Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski Reviewed-by: Thomas Huth --- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 32 ------------------- ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml | 25 --------------- .../s390-default-cpu-kvm-ccw-virtio-2.7.xml | 16 ---------- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 32 ------------------- ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml | 27 ---------------- .../s390-default-cpu-tcg-ccw-virtio-2.7.xml | 16 ---------- tests/qemuxmlconftest.c | 2 -- 7 files changed, 150 deletions(-) delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2= .7.s390x-latest.args delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2= .7.s390x-latest.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2= .7.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2= .7.s390x-latest.args delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2= .7.s390x-latest.xml delete mode 100644 tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2= .7.xml 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.7.s= 390x-latest.args deleted file mode 100644 index 0d44697425..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-lates= t.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.config \ -/usr/bin/qemu-system-s390x \ --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 \ --accel kvm \ --cpu host \ --m size=3D262144k \ --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 \ --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 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000= "}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don 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.7.s3= 90x-latest.xml deleted file mode 100644 index ae39e6277d..0000000000 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-lates= t.xml +++ /dev/null @@ -1,25 +0,0 @@ - - test - 9aa4b45c-b9dd-45ef-91fe-862b27b4231f - 262144 - 262144 - 1 - - hvm - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-s390x - -