From nobody Sat Nov 15 22:37:26 2025 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=1747222090; cv=none; d=zohomail.com; s=zohoarc; b=QYZSf6dpU+s8WxkdfjampfWlYh2J5FkuzJypq7JZCD6OJADHxiFqM54c0W14YGvGBUflUk2w3PDFmyLiDf6bbIM7g8okBOQLysYvUTLl94t8IjWCmwbdT0wACb6Jzp+TyLbKP2A6i59yXXQaTxCTTIMTbguJMa0MHZm5aqdCLTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222090; h=Content-Type: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=07nOEpguW3GXoG/tPJqxE2PwwSI+/QZ101/bNuxMAXM=; b=UgmXrcyStm7xdbgoL+O9gjfOgJrQkmRHI1istA+7mx5aHm5GQR6KDH8CseSFPyEQv+SPaf8ozR4Efjb0rtLGKml8kCHS3Wvl4nEpYHctN8Z+8lKKPoPjwbecACQe9lq0QlhxJPm7MFQkDtMxU+VlSNAwxEY8MxitAwoXvevD2fU= 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 1747222090270144.97697061309668; Wed, 14 May 2025 04:28:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAH9-0001PB-VU; Wed, 14 May 2025 07:27:51 -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 1uFAH7-0001Od-1B for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:49 -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 1uFAH5-00028Q-4h for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:48 -0400 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-622-CQ4gpicNMdyA5T8cBozoVw-1; Wed, 14 May 2025 07:27:40 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 2A97E195DB9C; Wed, 14 May 2025 11:27:39 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-219.str.redhat.com [10.33.192.219]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C71E419560B3; Wed, 14 May 2025 11:27:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=07nOEpguW3GXoG/tPJqxE2PwwSI+/QZ101/bNuxMAXM=; b=egD80lrKJGDF2ub7BRjGOsmlpwWE/4uC91Q2CweWpr3mEjUOmB9DRTub8LRjynv1jYhcOp kAGa1D4/CfVycx5d4hing+RzMG13TowXHg239YYPc1QN8mVfSqlewf7N4hfGQX1p+yyF/V gBiw9hOL+xz2HTe1O26/g8PJqnVrJ/U= X-MC-Unique: CQ4gpicNMdyA5T8cBozoVw-1 X-Mimecast-MFC-AGG-ID: CQ4gpicNMdyA5T8cBozoVw_1747222059 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 02/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 machine type Date: Wed, 14 May 2025 13:27:22 +0200 Message-ID: <20250514112733.456644-3-thuth@redhat.com> In-Reply-To: <20250514112733.456644-1-thuth@redhat.com> References: <20250514112733.456644-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.686, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1747222091088019000 From: Thomas Huth The s390-ccw-virtio-2.11 machine is older than 6 years, so according to our machine support policy, it can be removed now. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-3-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 206124f7a46..104a24ee002 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1252,31 +1252,6 @@ static void ccw_machine_2_12_class_options(MachineCl= ass *mc) } DEFINE_CCW_MACHINE(2, 12); =20 -#ifdef CONFIG_S390X_LEGACY_CPUS - -static void ccw_machine_2_11_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V2_1= 1 }; - ccw_machine_2_12_instance_options(machine); - - /* before 2.12 we emulated the very first z900 */ - s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); -} - -static void ccw_machine_2_11_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] =3D { - { TYPE_SCLP_EVENT_FACILITY, "allow_all_mask_sizes", "off", }, - }; - - ccw_machine_2_12_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} -DEFINE_CCW_MACHINE(2, 11); - -#endif - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.49.0