From nobody Fri Dec 19 02:50:54 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=1746512584; cv=none; d=zohomail.com; s=zohoarc; b=MPKg8dd6iUSiBkxE62QSpFzq0gFaFm6F/FmjtG1FhfHaEcaPIz5Ir+mMmv1rNNKtYHLF9KjqFZPiZxHn7MJyQOSU46Y+zHQmEYLwKA6ilMnwxKlqmqYGRoRfRo9OxnmWYXfmaPTyqdzalLhiR+8FkyqwH3QygfV6ItFVlfNCwD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512584; 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=U6PO+RhZXN6T6qLDuDZyjTybZZDvx07WvavT0MdWRA8=; b=XujwYUt7tMrCVrWuumnoid/mjNu9S0lyXqMXAnFbmpR7y2sAwJ0rRJVKFZV9fGdC5hdA2eNtjgPixB2FlK+yiPhNFTDUxJIKo0dpOKTmlJaDExkNmDJvfwJYgePlETgAFcZbv3E2XyQ3zTFfLlfQgAZ5sZuVOeXJxeCFEho+Ae8= 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 1746512584421581.1982718351061; Mon, 5 May 2025 23:23:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBgq-0007x9-IV; Tue, 06 May 2025 02:22:04 -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 1uCBgp-0007wY-0L for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:03 -0400 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 1uCBgm-0005q6-U8 for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:02 -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-679-PqV9x7ZsNPeYwNXWI0R8ew-1; Tue, 06 May 2025 02:21:58 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 131E2180098B; Tue, 6 May 2025 06:21:57 +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 A1BE318001D5; Tue, 6 May 2025 06:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512519; 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=U6PO+RhZXN6T6qLDuDZyjTybZZDvx07WvavT0MdWRA8=; b=ZsTFWfSTauBNww1+ZRsNvOlHzDUseD2V/xgMMq+fi0Ew8kGocuMNJyVWWnjq7NdI14jXH/ LBD0yBBySD8baDlS3D77wZmwD7FbMgnDhRPu06Qh+v5Ho4SIIpYBVDNtET6iTQqSNk1Mtn QLrqXAc/+GewwAlLcW+T9/0Sh7L/ZUc= X-MC-Unique: PqV9x7ZsNPeYwNXWI0R8ew-1 X-Mimecast-MFC-AGG-ID: PqV9x7ZsNPeYwNXWI0R8ew_1746512517 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 1/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type Date: Tue, 6 May 2025 08:21:40 +0200 Message-ID: <20250506062148.306084-2-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.129.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=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: 1746512587285019000 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The s390-ccw-virtio-2.10 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: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 94edd42dd25..0813eb4ea47 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1273,18 +1273,6 @@ static void ccw_machine_2_11_class_options(MachineCl= ass *mc) } DEFINE_CCW_MACHINE(2, 11); =20 -static void ccw_machine_2_10_instance_options(MachineState *machine) -{ - ccw_machine_2_11_instance_options(machine); -} - -static void ccw_machine_2_10_class_options(MachineClass *mc) -{ - ccw_machine_2_11_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len); -} -DEFINE_CCW_MACHINE(2, 10); - #endif =20 static void ccw_machine_register_types(void) --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=1746512631; cv=none; d=zohomail.com; s=zohoarc; b=dpXUHJ/3PTRQNwl7cIRYMQJaL0wnxZTdEI5k/BGi04c61HeIq83n61mpZRHTN0MAIyTkmU3gg7I/bzFhBydm4G74xKfnHG8S02k3urxu+NuJEh6YnB4yjJ+N55i7qA0iOlQuGU9f0memGkU6BoAwSZnrN7SwCAv2S+DxLxfou7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512631; 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=7lsvq2l8fpqfDzQRtjnUzgpQNaIbBs7LgzXEwVT8Akk=; b=FL80jaMP2VdVxwffI9HMzywfyB+6CGgV2q6lVJHgGsr1N5OP0A8cEIez0Use7HBiw2IIZwh42CHJ3tElm5qLrqjw+22Phf+yhV1ZQXxK4SNUgbXd9calgZJhcLAS/2ecKCoLHR5kCIWD7mEge5LcgO6I1SJEa9BFjRapY0G6FyU= 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 1746512630994810.2026581188625; Mon, 5 May 2025 23:23:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBh1-0007ze-78; Tue, 06 May 2025 02:22:15 -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 1uCBgw-0007xy-Qs for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:10 -0400 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 1uCBgt-0005rA-Ts for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:10 -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-513-9QuMce4bMACwOwxtMfSVNA-1; Tue, 06 May 2025 02:22:01 -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 552291955DCC; Tue, 6 May 2025 06:22:00 +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 94ED318001D7; Tue, 6 May 2025 06:21:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512524; 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=7lsvq2l8fpqfDzQRtjnUzgpQNaIbBs7LgzXEwVT8Akk=; b=esnXf2LlIomYXyVDMqtdalF+Tz2+3BEhOf03a/1yRpgtEpdBJCs3gCABfYYOVplVVkwQyf Xu94VPF090qqDLBcDAiKky9SfvSWKa8NDhPAEGtXlP0JvwyRXLhlc6d/0VcgNtYE0KgC1g IDGcya7qJaKdL3oQRKC8qX8AlrI6xXg= X-MC-Unique: 9QuMce4bMACwOwxtMfSVNA-1 X-Mimecast-MFC-AGG-ID: 9QuMce4bMACwOwxtMfSVNA_1746512520 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 2/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 machine type Date: Tue, 6 May 2025 08:21:41 +0200 Message-ID: <20250506062148.306084-3-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.129.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: 1746512632968019000 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Thomas Huth Reviewed-by: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 0813eb4ea47..2c90702d834 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1250,31 +1250,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 From nobody Fri Dec 19 02:50:54 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=1746512602; cv=none; d=zohomail.com; s=zohoarc; b=SAeLj06Wxe80EZbrsFtF9UPXa+ffZPFDTxAEMCS0/if7pI+9+UXxYD4qg4kgiOKUn+FIbsen67sP0NKsY4GwdKdkgqgICwy0DXGbfV1pw3QSJdARDPEZmjrFQuulddHIJmP9OthjrSyjUM9idhW6A87Odp8BKfppr/HyWbVzTNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512602; 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=BkBtL1JHK5PQgJ+gK3ghgX2FpY2c7m/hV4hes84TWb4=; b=GO7lWQwvWPGXkAjjMUHqDMr6KiC/cufVYHlLb9W9F6yyoWyvCV9GKbxFDHRIVIjGCq2hfqVGHR99kIOZjhi1/MF+S5/dA5rcNB1zwot+7DQLydcGyjUwNvbOpQuemYCSlDph4Iz4rcNbbGxgpQ6swSQyThpZS4e/uF1yyd9mZpE= 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 1746512602632957.9956739254833; Mon, 5 May 2025 23:23:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBgz-0007ym-AG; Tue, 06 May 2025 02:22:13 -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 1uCBgw-0007y3-VG for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:11 -0400 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 1uCBgv-0005rt-8K for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:10 -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-441-sQ9dAbBCM-GVH7GOeKhCcw-1; Tue, 06 May 2025 02:22:05 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E402E195606C; Tue, 6 May 2025 06:22:03 +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 08DAB1800352; Tue, 6 May 2025 06:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512528; 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=BkBtL1JHK5PQgJ+gK3ghgX2FpY2c7m/hV4hes84TWb4=; b=QADCWEl3eiyCRD8vAUPEO1yU8L7sf2E0tInBNO6/65l2jNlGq8859smACnkJJwhqbDzrtk 7MNoTvlJR2GiEnPKYnMl4H20TypUgJ7kOxoovLs+jfTMyE8mJEuCeoCnXQ2sBUN7ikvrJW tQsWYufMgjCQacBQ+lSKenydxa++3oI= X-MC-Unique: sQ9dAbBCM-GVH7GOeKhCcw-1 X-Mimecast-MFC-AGG-ID: sQ9dAbBCM-GVH7GOeKhCcw_1746512524 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 3/9] hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes" code Date: Tue, 6 May 2025 08:21:42 +0200 Message-ID: <20250506062148.306084-4-thuth@redhat.com> In-Reply-To: <20250506062148.306084-1-thuth@redhat.com> References: <20250506062148.306084-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.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.129.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: 1746512604133116600 From: Thomas Huth Now that the machine types 2.11 and older have been removed, we don't need the "allow_all_mask_sizes" compatibility handling code anymore and can remove it now. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth Reviewed-by: Eric Farman --- hw/s390x/event-facility.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 1afe3645730..7b7bf237fed 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -45,13 +45,6 @@ struct SCLPEventFacility { uint32_t receive_mask_pieces[2]; sccb_mask_t receive_mask; }; - /* - * when false, we keep the same broken, backwards compatible behaviour= as - * before, allowing only masks of size exactly 4; when true, we implem= ent - * the architecture correctly, allowing all valid mask sizes. Needed f= or - * migration toward older versions. - */ - bool allow_all_mask_sizes; /* length of the receive mask */ uint16_t mask_length; }; @@ -294,8 +287,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCC= B *sccb) uint16_t mask_length =3D be16_to_cpu(we_mask->mask_length); sccb_mask_t tmp_mask; =20 - if (!mask_length || (mask_length > SCLP_EVENT_MASK_LEN_MAX) || - ((mask_length !=3D 4) && !ef->allow_all_mask_sizes)) { + if (!mask_length || mask_length > SCLP_EVENT_MASK_LEN_MAX) { sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INVALID_MASK_LENGTH); return; } @@ -355,13 +347,6 @@ static bool vmstate_event_facility_mask64_needed(void = *opaque) return (ef->receive_mask & 0xFFFFFFFF) !=3D 0; } =20 -static bool vmstate_event_facility_mask_length_needed(void *opaque) -{ - SCLPEventFacility *ef =3D opaque; - - return ef->allow_all_mask_sizes; -} - static const VMStateDescription vmstate_event_facility_mask64 =3D { .name =3D "vmstate-event-facility/mask64", .version_id =3D 0, @@ -377,7 +362,6 @@ static const VMStateDescription vmstate_event_facility_= mask_length =3D { .name =3D "vmstate-event-facility/mask_length", .version_id =3D 0, .minimum_version_id =3D 0, - .needed =3D vmstate_event_facility_mask_length_needed, .fields =3D (const VMStateField[]) { VMSTATE_UINT16(mask_length, SCLPEventFacility), VMSTATE_END_OF_LIST() @@ -399,31 +383,12 @@ static const VMStateDescription vmstate_event_facilit= y =3D { } }; =20 -static void sclp_event_set_allow_all_mask_sizes(Object *obj, bool value, - Error **errp) -{ - SCLPEventFacility *ef =3D (SCLPEventFacility *)obj; - - ef->allow_all_mask_sizes =3D value; -} - -static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **errp) -{ - SCLPEventFacility *ef =3D (SCLPEventFacility *)obj; - - return ef->allow_all_mask_sizes; -} - static void init_event_facility(Object *obj) { SCLPEventFacility *event_facility =3D EVENT_FACILITY(obj); DeviceState *sdev =3D DEVICE(obj); =20 event_facility->mask_length =3D 4; - event_facility->allow_all_mask_sizes =3D true; - object_property_add_bool(obj, "allow_all_mask_sizes", - sclp_event_get_allow_all_mask_sizes, - sclp_event_set_allow_all_mask_sizes); =20 /* Spawn a new bus for SCLP events */ qbus_init(&event_facility->sbus, sizeof(event_facility->sbus), --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=1746512605; cv=none; d=zohomail.com; s=zohoarc; b=dt/fwLhCIWOVFBndOPGBcGKn+9LF08PqreKbGdCkJrm2IrWzTrxWbIQVTcJgld0k/tNXioKPiIHHo+X/FEJ8XwliYvA7lwH1it4aoiGDDMaFHX8hlnUlQUCvGxN9Idpbvygq+h84I5ptvstwtQhNy0xqEHVnTYSGUbu26gbAnUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512605; 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=pDIgUKE7JNG8uMUV1VE9NnIXQM++kgopu14d4ShCrus=; b=gTECS6QYJo5qpNVEZKLRIXM4jYM/snQ5/bp1FBHpvbhwaSArqvxQAt7g1AfP+z9zKu9/apaB2Oum1vIDRBU7IJJTux3a94GmSSmFFvnbbP/5ejgnc+Xp4SCv2blYYM5LUCECpoNqnqKaqpuVS6E3A9rd+n3WN2cfFT8Ppf4O3Dg= 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 1746512605191991.2949482563747; Mon, 5 May 2025 23:23:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBh2-00080G-9w; Tue, 06 May 2025 02:22:16 -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 1uCBh0-0007yu-B0 for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:14 -0400 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 1uCBgy-0005sx-LS for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:13 -0400 Received: from mx-prod-mc-08.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-301-ACQK8zekPHSiwAZoh24cog-1; Tue, 06 May 2025 02:22:08 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F53D1800373; Tue, 6 May 2025 06:22:07 +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 8407C18001D5; Tue, 6 May 2025 06:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512531; 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=pDIgUKE7JNG8uMUV1VE9NnIXQM++kgopu14d4ShCrus=; b=Vy38pDP/oQ5y9NQjH17fnNsi4cV9N9HwsckkDgeYBfYrxVmVyqnh3af0DwP+/shg2xPB6B ennYY1AYE5ZHTJBGHZ7m9BnAMeFZTIt9DbMvl2SYND5Cu8SD4TiRtx6zsFNg1S1oX2Pw6Y N34GivLBtzs5f8OjZccGvaMrtqlY+I8= X-MC-Unique: ACQK8zekPHSiwAZoh24cog-1 X-Mimecast-MFC-AGG-ID: ACQK8zekPHSiwAZoh24cog_1746512527 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 4/9] target/s390x: Rename the qemu_V2_11 feature set to qemu_MIN Date: Tue, 6 May 2025 08:21:43 +0200 Message-ID: <20250506062148.306084-5-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.129.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: 1746512605797116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Now that the v2.11 machine type has been removed, it does not make sense to keep the qemu_V2_11 feature set around. This is rather the (minimum) feature set of the oldest supported machine now, so rename it to qemu_MIN. Signed-off-by: Thomas Huth Reviewed-by: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/gen-features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 41840677ce7..754fc843d24 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -844,7 +844,8 @@ static uint16_t default_GEN17_GA1[] =3D { =20 /* QEMU (CPU model) features */ =20 -static uint16_t qemu_V2_11[] =3D { +static uint16_t qemu_MIN[] =3D { + /* Features supported by the default CPU of the oldest machine type */ S390_FEAT_GROUP_PLO, S390_FEAT_ESAN3, S390_FEAT_ZARCH, @@ -1053,7 +1054,7 @@ static FeatGroupDefSpec FeatGroupDef[] =3D { * QEMU (CPU model) features *******************************/ static FeatGroupDefSpec QemuFeatDef[] =3D { - QEMU_FEAT_INITIALIZER(V2_11), + QEMU_FEAT_INITIALIZER(MIN), QEMU_FEAT_INITIALIZER(V3_1), QEMU_FEAT_INITIALIZER(V4_0), QEMU_FEAT_INITIALIZER(V4_1), --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=1746512592; cv=none; d=zohomail.com; s=zohoarc; b=cg8zSXiu7kFcJX9BB/Tcwc77azDuEXfguguyw0A6JcheR7xuxowR21yotgr0hyBLJt/f79mlSmqTVRsR2U2ebwi+KNj3ebdeueoyPVLjLxZG8ECELyidhYSze1lK2zuPENLAzz6DLCI1Vn62OmkjthcUYGndWKYxNDNSYIYEEbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512592; 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=IwQsvPRr9muU3nnMTfzOLXv/34O46QmI+0RUSaMzWpo=; b=BTQ+dv210fzuqEW4Pz74JNZyomCQoOiPQkv/3qZIYfN+C3hL6gwZOh05CFNzBY4SPXp85rnchPTF2m2hnDRsM5dboX6wBZUknGd6YapHdLj9BYm+3CBVBcolzmixHtlDVCgh2AeOcCQPu79YW2F28RiFI/oXSpcOJRUCBVEtzJ0= 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 1746512592808482.2242009886294; Mon, 5 May 2025 23:23:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBh7-00081X-4P; Tue, 06 May 2025 02:22:21 -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 1uCBh4-00080u-Oq for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:19 -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 1uCBh3-0005tr-4Z for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:18 -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-610-0QhmKLsLPEuitd3VfcNOOQ-1; Tue, 06 May 2025 02:22:12 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58ACB195605F; Tue, 6 May 2025 06:22:11 +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 001691800352; Tue, 6 May 2025 06:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512536; 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=IwQsvPRr9muU3nnMTfzOLXv/34O46QmI+0RUSaMzWpo=; b=dgOjx6WYm6gBgoFmCKAhSwgqjhCW7AkSrGVzZ13fmBEiBzmXu2Wg+pzzOq/O/Y0uFrI2S5 Dd3QpvuGUiz3wCaAuLC+2ufrdx9gZu74Tec9FwhHDeE2CS5rJc6syO2LtfLCHgwPMBdeo/ bdZQwcD+2FReNgpQIGiLqsgbPtdLk+0= X-MC-Unique: 0QhmKLsLPEuitd3VfcNOOQ-1 X-Mimecast-MFC-AGG-ID: 0QhmKLsLPEuitd3VfcNOOQ_1746512531 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 5/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Date: Tue, 6 May 2025 08:21:44 +0200 Message-ID: <20250506062148.306084-6-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=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: 1746512594982019000 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Thomas Huth Reviewed-by: Eric Farman 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 2c90702d834..e612030bc18 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1236,20 +1236,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 From nobody Fri Dec 19 02:50:54 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=1746512621; cv=none; d=zohomail.com; s=zohoarc; b=I4yatYGLD0tYBCKoC+cORN62+4NOUQFg1cbkzvzLqxGO97jDQsZC/R5FfrzdK4SuMe/Tkqq0PnsbZoS+anpLF2yFjCQH4aYUJTgaZTXRByW8p2Kw+r3wpdbBnpnNZ40GxFBDjICwZ5GqWJQg7Q5f7L8HnHcyEMgsvsotvAJbfJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512621; 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=Ar9j5CQf0c2NoGVGaI1oUnEISybK1lyYMsDARiInHUg=; b=JKdUrj0ImvdN9CQ1KKu/23JjltWpCjlYbQ6A8RCYhNo2IYSgzpsBIbzyRaC8oWQYnKUBqKbWnGWJmxKAnNGHq/FhdHbqH4mzv2njtYev/Mv9JHcJcY7K0eLGQtUOwtVPAmaolfowKYZBQ/2fBuQDgv24xBvyQeGhbPFjTHPzeT8= 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 1746512621812488.1055092337813; Mon, 5 May 2025 23:23:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBhC-00083q-Ai; Tue, 06 May 2025 02:22:26 -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 1uCBhA-00083H-Tu for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:24 -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 1uCBh8-0005um-GW for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:23 -0400 Received: from mx-prod-mc-05.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-684-tp7IZCSSNIiiQQW0g9W5Lw-1; Tue, 06 May 2025 02:22:16 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3EF981955E75; Tue, 6 May 2025 06:22:15 +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 0B05718001D5; Tue, 6 May 2025 06:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512541; 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=Ar9j5CQf0c2NoGVGaI1oUnEISybK1lyYMsDARiInHUg=; b=CKJhiDCmO/+cSPr9Apjtrrlzd1B3KjdqW6BOy7qLGmlGllFYg4mbZdtzF4JvNc/jzfhnJk rQkY747HUVDOoDlx1uXisMu3edd7dnGE+iHl3suzC5kY9NPbrX4q/NUwoj7zsZ5b5uxu6Q ktFde/Fqx6/mL38LvL7WGCuRN7Rx8AU= X-MC-Unique: tp7IZCSSNIiiQQW0g9W5Lw-1 X-Mimecast-MFC-AGG-ID: tp7IZCSSNIiiQQW0g9W5Lw_1746512535 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 6/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type Date: Tue, 6 May 2025 08:21:45 +0200 Message-ID: <20250506062148.306084-7-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=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: 1746512622005116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The s390-ccw-virtio-3.0 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: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e612030bc18..8f01e68ef11 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1221,21 +1221,6 @@ static void ccw_machine_3_1_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(3, 1); =20 -static void ccw_machine_3_0_instance_options(MachineState *machine) -{ - ccw_machine_3_1_instance_options(machine); -} - -static void ccw_machine_3_0_class_options(MachineClass *mc) -{ - S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); - - s390mc->hpage_1m_allowed =3D false; - ccw_machine_3_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); -} -DEFINE_CCW_MACHINE(3, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=1746512584; cv=none; d=zohomail.com; s=zohoarc; b=YXin87XeuCZ0FXxZVqF6Ld6aN9GbSqnCK0v/Kev+WowyIU0IeQ0PP0jc7z8g09csP1IFEldcZFMKYyUV+alUs1BMLstNjUiX4rPXoNH/BdFG9R5AEsHt7DFJgXRmKtmPcIKFZxoKXjk72Zxh9ddBjRwTpCaPt15p5EkaQXukKho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512584; 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=g3cJkgFXgK3LTlw3ckwp1HepM2so4vHXarjCd9syzLs=; b=g75MesbPIP/zWYhVRc3VXTtDNaTiL1u+TzmVTVxn+80AntuxRjFAg/b0uR3yGpAigI9h37KhwdQvB/w1hYoSwBc/FNdxcOgnq0NZ33zNXs5QqOvbyj2/Aip2TcLCOGbWebfy5sicLSTynBSF5kiWbxaK9MEDbazMlPHpf1P9jdU= 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 1746512584773729.8225241360494; Mon, 5 May 2025 23:23:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBhF-000850-6l; Tue, 06 May 2025 02:22:29 -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 1uCBhD-00084T-78 for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:27 -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 1uCBhB-0005vo-EG for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:26 -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-88-p7JO6RDWNN-O7TfSdQW3JA-1; Tue, 06 May 2025 02:22:21 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AE969180087F; Tue, 6 May 2025 06:22:19 +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 0B2B118001D5; Tue, 6 May 2025 06:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512544; 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=g3cJkgFXgK3LTlw3ckwp1HepM2so4vHXarjCd9syzLs=; b=isGoVaHyPD1i/DAFqRAJmlr7DvRt7I6/wL56Ehj4l9a0xgd5e64k2QrVlhrA5Ye7tjMzCe /i7zvyuGzkJpFZpaltUad91g9pbSvRuoSRQrDHHuW5XHFukO6Xo+a+ThlLcnzqD4MFzdn8 uMx7sZVZocxq6YxCukQ0VeAmYAYAS2k= X-MC-Unique: p7JO6RDWNN-O7TfSdQW3JA-1 X-Mimecast-MFC-AGG-ID: p7JO6RDWNN-O7TfSdQW3JA_1746512539 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 7/9] hw/s390x: Remove the obsolete hpage_1m_allowed switch Date: Tue, 6 May 2025 08:21:46 +0200 Message-ID: <20250506062148.306084-8-thuth@redhat.com> In-Reply-To: <20250506062148.306084-1-thuth@redhat.com> References: <20250506062148.306084-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.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=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: 1746512586037116600 From: Thomas Huth The s390-ccw-virtio-3.0 machine was the last one that used the hpage_1m_allowed switch. Since we removed this machine type, we can now remove the switch and the related code, too. This allows us to get rid of the get_machine_class() hack and the big fat warning comment there. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth Reviewed-by: Eric Farman --- include/hw/s390x/s390-virtio-ccw.h | 4 ---- hw/s390x/s390-virtio-ccw.c | 35 ------------------------------ target/s390x/kvm/kvm.c | 6 ----- 3 files changed, 45 deletions(-) diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index 686d9497d20..321b26df308 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -53,11 +53,7 @@ struct S390CcwMachineClass { MachineClass parent_class; =20 /*< public >*/ - bool hpage_1m_allowed; int max_threads; }; =20 -/* 1M huge page mappings allowed by the machine */ -bool hpage_1m_allowed(void); - #endif diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 8f01e68ef11..301668a0bff 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -746,39 +746,6 @@ static inline void machine_set_dea_key_wrap(Object *ob= j, bool value, ms->dea_key_wrap =3D value; } =20 -static S390CcwMachineClass *current_mc; - -/* - * Get the class of the s390-ccw-virtio machine that is currently in use. - * Note: libvirt is using the "none" machine to probe for the features of = the - * host CPU, so in case this is called with the "none" machine, the functi= on - * returns the TYPE_S390_CCW_MACHINE base class. In this base class, all t= he - * various "*_allowed" variables are enabled, so that the *_allowed() wrap= pers - * below return the correct default value for the "none" machine. - * - * Attention! Do *not* add additional new wrappers for CPU features via th= is - * mechanism anymore. CPU features should be handled via the CPU models, - * i.e. checking with s390_has_feat() should be sufficient. - */ -static S390CcwMachineClass *get_machine_class(void) -{ - if (unlikely(!current_mc)) { - /* - * No s390 ccw machine was instantiated, we are likely to - * be called for the 'none' machine. The properties will - * have their after-initialization values. - */ - current_mc =3D S390_CCW_MACHINE_CLASS( - object_class_by_name(TYPE_S390_CCW_MACHINE)); - } - return current_mc; -} - -bool hpage_1m_allowed(void) -{ - return get_machine_class()->hpage_1m_allowed; -} - static void machine_get_loadparm(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -812,7 +779,6 @@ static void ccw_machine_class_init(ObjectClass *oc, con= st void *data) S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); DumpSKeysInterface *dsi =3D DUMP_SKEYS_INTERFACE_CLASS(oc); =20 - s390mc->hpage_1m_allowed =3D true; s390mc->max_threads =3D 1; mc->reset =3D s390_machine_reset; mc->block_default_type =3D IF_VIRTIO; @@ -886,7 +852,6 @@ static const TypeInfo ccw_machine_info =3D { #define DEFINE_CCW_MACHINE_IMPL(latest, ...) = \ static void MACHINE_VER_SYM(mach_init, ccw, __VA_ARGS__)(MachineState = *mach) \ { = \ - current_mc =3D S390_CCW_MACHINE_CLASS(MACHINE_GET_CLASS(mach)); = \ MACHINE_VER_SYM(instance_options, ccw, __VA_ARGS__)(mach); = \ ccw_init(mach); = \ } = \ diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index b9f14221976..6cd2ebc5f1f 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -298,12 +298,6 @@ void kvm_s390_set_max_pagesize(uint64_t pagesize, Erro= r **errp) return; } =20 - if (!hpage_1m_allowed()) { - error_setg(errp, "This QEMU machine does not support huge page " - "mappings"); - return; - } - if (pagesize !=3D 1 * MiB) { error_setg(errp, "Memory backing with 2G pages was specified, " "but KVM does not support this memory backing"); --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=1746512621; cv=none; d=zohomail.com; s=zohoarc; b=fYuviFUkkbvrsB3tVBA9GOBdZTgh3aR63WcbJFT5JZCUxgyQuzTXrcOvqGU94/prDTdi7nu27gDK/B1peZYoD0zgFex9henVNJLKdGBgtX3umwGo37el4I4Hwr8r7sf6JwdRpvMJ9QWDuCg7/LXKulRMVrhQIIghAVd51BIh8Hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746512621; 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=3UlmcBcWSFQ/sobCSaYGjpW7mp5H76WoWAegDHjityI=; b=LQoc6kTO3UjbwHIV6tVB/kAQJE31W/kBRitKM0Cidt8hu+BzCTjjexpHrKbAX+ntKhop+5CPJIWIZVmnErOlAHq8yNiGpb0zbIXTjCmMztsvG1Ps4Y9hGILrSTX31eV3aHDgrJDJwtnhhxcJ+dw81Cmitjsp0qU1umXi4ILkb7Y= 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 1746512621106574.6848164156429; Mon, 5 May 2025 23:23:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCBhH-00085x-S5; Tue, 06 May 2025 02:22:31 -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 1uCBhG-00085e-WE for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:31 -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 1uCBhF-0005wc-Df for qemu-devel@nongnu.org; Tue, 06 May 2025 02:22:30 -0400 Received: from mx-prod-mc-05.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-332-ZHbZ7s5LOfCHdLr32KJRDQ-1; Tue, 06 May 2025 02:22:25 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 149871955E7D; Tue, 6 May 2025 06:22:24 +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 1B48B1800352; Tue, 6 May 2025 06:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746512548; 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=3UlmcBcWSFQ/sobCSaYGjpW7mp5H76WoWAegDHjityI=; b=bow5jTlBN8Z+o+TO4CmVN9+5HMij+rZ1JN3nFR5FCx9kFpOs++mKY6NfDTb4HlAs5HFY2Q Ep4wdQQFWkHms1WzbmSWyNgNrYpowoNb3ayxs9DIN+OVx4UmGX6Gy/LDd+IfvRd4ZlfDP+ Wsxjw9wlifE9y/ZfZlb2L2xToQLmgqY= X-MC-Unique: ZHbZ7s5LOfCHdLr32KJRDQ-1 X-Mimecast-MFC-AGG-ID: ZHbZ7s5LOfCHdLr32KJRDQ_1746512544 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 8/9] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type Date: Tue, 6 May 2025 08:21:47 +0200 Message-ID: <20250506062148.306084-9-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=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: 1746512622020116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The s390-ccw-virtio-3.1 machine is older than 6 years, so according to our machine support policy, it can be removed now. The v3.1 CPU feature group gets merged into the minimum CPU feature group now. Signed-off-by: Thomas Huth Reviewed-by: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 16 ---------------- target/s390x/gen-features.c | 4 ---- 2 files changed, 20 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 301668a0bff..f08e0980b40 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1170,22 +1170,6 @@ static void ccw_machine_4_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(4, 0); =20 -static void ccw_machine_3_1_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V3_1= }; - ccw_machine_4_0_instance_options(machine); - s390_cpudef_featoff_greater(14, 1, S390_FEAT_MULTIPLE_EPOCH); - s390_cpudef_group_featoff_greater(14, 1, S390_FEAT_GROUP_MULTIPLE_EPOC= H_PTFF); - s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat); -} - -static void ccw_machine_3_1_class_options(MachineClass *mc) -{ - ccw_machine_4_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); -} -DEFINE_CCW_MACHINE(3, 1); - 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 754fc843d24..4346b92431b 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -849,9 +849,6 @@ static uint16_t qemu_MIN[] =3D { S390_FEAT_GROUP_PLO, S390_FEAT_ESAN3, S390_FEAT_ZARCH, -}; - -static uint16_t qemu_V3_1[] =3D { S390_FEAT_DAT_ENH, S390_FEAT_IDTE_SEGMENT, S390_FEAT_STFLE, @@ -1055,7 +1052,6 @@ static FeatGroupDefSpec FeatGroupDef[] =3D { *******************************/ static FeatGroupDefSpec QemuFeatDef[] =3D { QEMU_FEAT_INITIALIZER(MIN), - QEMU_FEAT_INITIALIZER(V3_1), QEMU_FEAT_INITIALIZER(V4_0), QEMU_FEAT_INITIALIZER(V4_1), QEMU_FEAT_INITIALIZER(V6_0), --=20 2.49.0 From nobody Fri Dec 19 02:50:54 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=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: Eric Farman 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