From nobody Fri Dec 19 14:39:17 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1736926784; cv=none; d=zohomail.com; s=zohoarc; b=hF+j1xAnJlwEQPTbs+gosrR4qNobBb7EvoPgnHObKuMN9tfPjVnp16OeEgY1FDBfVSW/sc7oVdFnnD47KHLQC+jdlR/z0fduDEnExLhmbHCIdGKqhujdmSe+jkMFOpK5ggFBEX+uLg6GXP3WUQB7/EVESnjVnl3DcWoizMKifgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736926784; 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=VLZ7YKNq8Yv3RmFibikDWPCTk3V023M6ehACWmL3KVQ=; b=R4CUCBNo6df5w1ODb7HvZyzapzVwFHrZCAGBAF0FUES7urGnbiQseo3625aoxJQwmA8uY/G9M8iCzPVbZ1avkLA+oWfdcT0I5JX+9e5HT0MMD7uApTPzubDQqS06Sihd9znCn0cXOUb7i6z75K6TICcKJIT/DhqpVJoOHtTU7pA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1736926784087294.31968732095606; Tue, 14 Jan 2025 23:39:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXxzb-0005I6-UW; Wed, 15 Jan 2025 02:39:11 -0500 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 1tXxza-0005HP-DV for qemu-devel@nongnu.org; Wed, 15 Jan 2025 02:39:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tXxzY-0007tZ-TT for qemu-devel@nongnu.org; Wed, 15 Jan 2025 02:39:09 -0500 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-225-gnXMXlZvMCCM2Qm956WSfw-1; Wed, 15 Jan 2025 02:39:04 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 6B3E51955DDE; Wed, 15 Jan 2025 07:39:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.143]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84044195608A; Wed, 15 Jan 2025 07:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736926748; 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=VLZ7YKNq8Yv3RmFibikDWPCTk3V023M6ehACWmL3KVQ=; b=W8DG4NUyixcTwnHbSxDQNakXI/E+3KujGaZFdNSsnK/hkQdG23UKPKs3v2ABTI8OaAlCAT S+oS0fYxZcDm0bhOqcOHjsqF5Oic0vgCj5SAtSnsLM65tOCzp+tZfNP6YdK1+gW6lnLQKN u2N2VGoe6qLc4Lpvo5+g5TrgUZj9/h0= X-MC-Unique: gnXMXlZvMCCM2Qm956WSfw-1 X-Mimecast-MFC-AGG-ID: gnXMXlZvMCCM2Qm956WSfw From: Thomas Huth To: qemu-s390x@nongnu.org, Christian Borntraeger , David Hildenbrand Cc: qemu-devel@nongnu.org, Halil Pasic , Eric Farman , Richard Henderson , Ilya Leoshkevich Subject: [PATCH 8/8] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Date: Wed, 15 Jan 2025 08:38:19 +0100 Message-ID: <20250115073819.15452-9-thuth@redhat.com> In-Reply-To: <20250115073819.15452-1-thuth@redhat.com> References: <20250115073819.15452-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.063, 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_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: 1736926785782019000 Content-Type: text/plain; charset="utf-8" The s390-ccw-virtio-2.12 machine is older than 6 years, so according to our machine support policy, it can be removed now. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 44f8082326..0f47a2b6f5 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1187,20 +1187,6 @@ static void ccw_machine_3_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(3, 0); =20 -static void ccw_machine_2_12_instance_options(MachineState *machine) -{ - ccw_machine_3_0_instance_options(machine); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_PPA15); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB); -} - -static void ccw_machine_2_12_class_options(MachineClass *mc) -{ - ccw_machine_3_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); -} -DEFINE_CCW_MACHINE(2, 12); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.47.1