From nobody Mon Feb 9 08:00:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1746512617; cv=none; d=zohomail.com; s=zohoarc; b=G1fT+3NK/7RupY9fk2MHD0Gn2dJzznD5I+INPBNTJUYLA8lZc8+GKFIzxX1iRp/ciApsNPnROJIYqvO2Ys26A6SNCCFIUNgSyres98l9Ey36a/B7cboJOB496tmj5NqYLMS2RjF2rkz4q357q0pWJDT8d87rpEr/Wbfb5pejZBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512617; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CAbUjR0UYbfX087EjMG7Y2Ht0e7os2VKyDheBQF5Nuk=; b=dz5UWdHs7oKMJ6tZjwyT+dUQ8gr7lGkgA0UH8LpHM73MXVZQCiIpXp+dxDId5W7n0NbXrosoTVL5DyaPAst3VXZG4U8u93FXnC16KHTEjRXMmJ06gfaeeHmhXja98Ati8gnd9Vrpc9CxDjuTbC2jZlhFmmEQp/I3J2K+bAnTD/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746512617645637.6144847650813; Mon, 5 May 2025 23:23:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBhM-00087O-1r; Tue, 06 May 2025 02:22:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCBhK-00086k-8x for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCBhI-0005xU-Nx for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:33 -0400 Received: from mx-prod-mc-04.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-500-kR1j2v28PImCdxYXFuwtPA-1; Tue, 06 May 2025 02:22:28 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7C0841956048; Tue, 6 May 2025 06:22:27 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.237]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A324118001D5; Tue, 6 May 2025 06:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CAbUjR0UYbfX087EjMG7Y2Ht0e7os2VKyDheBQF5Nuk=; b=ehSae39NG7DaIGsLV0wGWIXQ6KV9zvEAB6biY8KecCgGJhJc8UXlzN5g257FD9kOOLdI5/ AQVsPoNrdqGqwEVjcxMSE3mIjvlYh4eC8yiJWFFQM2Q0HZtKfbY1mVt/dqgFZbEKa737ka l/YNV6J5u++rilZiGKDaBmOuI+KgdjM= X-MC-Unique: kR1j2v28PImCdxYXFuwtPA-1 X-Mimecast-MFC-AGG-ID: kR1j2v28PImCdxYXFuwtPA_1746512547 From: Thomas Huth To: qemu-s390x@nongnu.org, Halil Pasic , Christian Borntraeger , Eric Farman Cc: qemu-devel@nongnu.org, David Hildenbrand , Ilya Leoshkevich Subject: [PATCH v2 9/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 machine type Date: Tue, 6 May 2025 08:21:48 +0200 Message-ID: <20250506062148.306084-10-thuth@redhat.com> In-Reply-To: <20250506062148.306084-1-thuth@redhat.com> References: <20250506062148.306084-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.414, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1746512618006116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The s390-ccw-virtio-4.0 machine is older than 6 years, so according to our machine support policy, it can be removed now. The corresponding v4.0 CPU feature group gets merged into the minimum feature group now. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 14 -------------- target/s390x/gen-features.c | 4 ---- 2 files changed, 18 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f08e0980b40..5469a727d83 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1156,20 +1156,6 @@ static void ccw_machine_4_1_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(4, 1); =20 -static void ccw_machine_4_0_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V4_0= }; - ccw_machine_4_1_instance_options(machine); - s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat); -} - -static void ccw_machine_4_0_class_options(MachineClass *mc) -{ - ccw_machine_4_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); -} -DEFINE_CCW_MACHINE(4, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 4346b92431b..a814ece82f2 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -878,9 +878,6 @@ static uint16_t qemu_MIN[] =3D { S390_FEAT_ADAPTER_INT_SUPPRESSION, S390_FEAT_MSA_EXT_3, S390_FEAT_MSA_EXT_4, -}; - -static uint16_t qemu_V4_0[] =3D { /* * Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER= not * implemented yet). @@ -1052,7 +1049,6 @@ static FeatGroupDefSpec FeatGroupDef[] =3D { *******************************/ static FeatGroupDefSpec QemuFeatDef[] =3D { QEMU_FEAT_INITIALIZER(MIN), - QEMU_FEAT_INITIALIZER(V4_0), QEMU_FEAT_INITIALIZER(V4_1), QEMU_FEAT_INITIALIZER(V6_0), QEMU_FEAT_INITIALIZER(V6_2), --=20 2.49.0