From nobody Sat Nov 15 22:31:39 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=1747222229; cv=none; d=zohomail.com; s=zohoarc; b=Jx9YsO1YkhPySm/HQ8DkYqJbLDzz8D0IggsyCog1l4dsv1qQe9w8Yk5EIX0dMDW+f0vFhuXhddG36+pHqPE6GlLDxx+4i3beWQIuhw8gble6S/naMgbLHz4TaCTuqVIURQw8VNesIs9vjXefEzowqFNPMAeFrqQ19Sz/Lu29k7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222229; 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=vngxAM5XkM3a3aDWrX000SUKllJkYiCoYk1yqkqNnNw=; b=izNXiK+SqNA58jUlYv5C9uOgf1jNVLV8z+Xj2XuZiU6R7m5/fLqtK40jwakPFUQMky8RdkuSv+vjEsFDvJhnl7ofVa4fITNBY7OEavRiqjwrZF6B1Wi2UtbiW7MTCfWujqph1o5gWZ2Y/llSGQJxReCBXpbcH8nBkdIVtvLEuqw= 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 1747222229195576.9391535622211; Wed, 14 May 2025 04:30:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHA-0001Q6-Rq; Wed, 14 May 2025 07:27:52 -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 1uFAH9-0001PF-29 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:51 -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 1uFAH7-00028i-C8 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:50 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-378-Xm4hoTVWOlC3rMDTInm77Q-1; Wed, 14 May 2025 07:27:45 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6E6271800258; Wed, 14 May 2025 11:27:44 +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 1EBC919560A3; Wed, 14 May 2025 11:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222068; 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=vngxAM5XkM3a3aDWrX000SUKllJkYiCoYk1yqkqNnNw=; b=VBPFAzRGGr0N+382Ptt1Ua4hEltXJmFtMrWEm7gpbKjC6ztcVeq82pyI/HGmwL8mqjs9Q7 DYRYW9aF2QrBwd9ZQBxU0FP7iJpD3YkEZc/isDyFr4n1JzuzjmXDbJy8qcirFto95rzK+d 8+uKauevxiNlZar/P/PHapikjqvHn40= X-MC-Unique: Xm4hoTVWOlC3rMDTInm77Q-1 X-Mimecast-MFC-AGG-ID: Xm4hoTVWOlC3rMDTInm77Q_1747222064 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 05/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Date: Wed, 14 May 2025 13:27:25 +0200 Message-ID: <20250514112733.456644-6-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: 1747222229717116600 From: Thomas Huth The s390-ccw-virtio-2.12 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-6-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 104a24ee002..db3d26b2e4e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1238,20 +1238,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.49.0