From nobody Sat Nov 15 20:48:55 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=1747222089; cv=none; d=zohomail.com; s=zohoarc; b=WjLZDqtslil5RrthSzGXThIrBMxkj2GRxY+u7en8akupBtHGN39RJwBnlG4SbRNzRFCURLbxtMMX6PXLlRytXMl0+zT4uIa11Fwl8pF5xGAOAhUoy5orZXDzqm1XzkEEozAL4TgS5g/SdXYRGmkJ/i6259N84k+B9BjicmHbHZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222089; 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=jECHodVbgas22a0VE4hhXYUoi0MupJJkQ+xRgSyTGYE=; b=i2jW7okn248LiAhTAk5wLw6rK5Uh6RmON0LV80JJJTwFv6wV8W/wCeiJh7HMlFKTSGmJd2jf600fpz65YhMAVvcyDomUBG2y4WRPM8iJqp32uiPlK23Mdxwuciyigv+MMbVi/2JqxDpwo9WkZs7+8jaLVTEJ2Rl6OuocGLNCMGs= 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 17472220897811002.7919646550087; Wed, 14 May 2025 04:28:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAH3-0001Nt-T6; Wed, 14 May 2025 07:27:45 -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 1uFAH1-0001Kv-Dd for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:43 -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 1uFAGz-00025O-BO for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:43 -0400 Received: from mx-prod-mc-02.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-3zFuw3CLMGaJluEuHKWgrA-1; Wed, 14 May 2025 07:27:38 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 61D311956087; Wed, 14 May 2025 11:27:37 +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 004BE19560A3; Wed, 14 May 2025 11:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222060; 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=jECHodVbgas22a0VE4hhXYUoi0MupJJkQ+xRgSyTGYE=; b=FHBgxQTCOqHK5PSKDmHYxIkCzK/ZivSDncHTuoZJLwyt+cU0nK5xsG6tYvSWm1zS6ts0LK MFQ2Pfp19HaeISnTAgnQAdy2fHLbAR+dITFgQe0HJk5sqFHyyVgfdVU9xUUq/CBJOrgg1L tGu7uL2jn6CccTwncN+0/+ZJsv9cLAc= X-MC-Unique: 3zFuw3CLMGaJluEuHKWgrA-1 X-Mimecast-MFC-AGG-ID: 3zFuw3CLMGaJluEuHKWgrA_1747222057 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 01/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type Date: Wed, 14 May 2025 13:27:21 +0200 Message-ID: <20250514112733.456644-2-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: 1747222091288019000 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-2-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 d5658afed96..206124f7a46 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1275,18 +1275,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 Sat Nov 15 20:48:55 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 From nobody Sat Nov 15 20:48:55 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=A4auztRwpCVDWhrel8PF2rihpXsn5D5pEEnrLGsE8e6u0oAZUm11mDglZdqC7tdPOoi6vfW899JE0MfV0RjW2JpbHi84qOGz4H2K4drsUNgDlUXeWfLbdF3BREK/Q5aXq0+opCNKnHgTrrYYAfL4m2Ig39RljiB9cTr3us56pTw= 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=+3xhh4BPTg8h0AIB2bmQVUR9EAcp4F80bu2hgOqAGbE=; b=TV8DSFYJYJ/B4wn+kW/AAyaSsowOPr3aDiHczIIJKdAJY/DXgTAmzDtM55Cfz8bzC3Sh2by3jFE0D4O0XlV/uJfLq8fc7rZP6ygN9NgbYBBCx+BXyLfueQUMyZ9v/sRmcuFSl7b4Vr16nMQvm8fVFliMFO3mG2Mcy0tAjtKMcG8= 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 1747222090113484.7234293141629; 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 1uFAH7-0001Oi-8x; Wed, 14 May 2025 07:27:50 -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 1uFAH5-0001OO-Lf for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:47 -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 1uFAH3-00027k-UC for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:47 -0400 Received: from mx-prod-mc-02.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-680-wTSum3TvOE2h-SGzO-tpQw-1; Wed, 14 May 2025 07:27:42 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E99AB1956087; Wed, 14 May 2025 11:27:40 +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 90E3019560A3; Wed, 14 May 2025 11:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222065; 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=+3xhh4BPTg8h0AIB2bmQVUR9EAcp4F80bu2hgOqAGbE=; b=JMQhUDepiYReP6FmyiVfwII4ga0NKihAruiu3mCOkh1ybIvExtcvmN/8+91QsC/H1WLDxN /Pgs4hB7nDOgJpZAVSly4ee8ot1PeKm2VynF6m4GFJhjDQ0tXZGqUNbsiOgruClXOry1KS CaMD9DsEKaUoKnyWtVj5t43rXk7BnW8= X-MC-Unique: wTSum3TvOE2h-SGzO-tpQw-1 X-Mimecast-MFC-AGG-ID: wTSum3TvOE2h-SGzO-tpQw_1747222061 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 03/13] hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes" code Date: Wed, 14 May 2025 13:27:23 +0200 Message-ID: <20250514112733.456644-4-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: 1747222090616116600 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 Message-ID: <20250506062148.306084-4-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 Sat Nov 15 20:48:55 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=leXfwvJtBBtIYL/qddmGAMkXls5MxEW4VZPCJUKqjJX9u4kGdSd5g9fo689y3p791Knqf7e+rTdH7QhpzyH4tA01ya4Z4H/ZCuVgRNfqUwimf0H+4XPg50F5HPYebxko/jFqaKuEIK0yO+L4Y2DbXJq7yyf/vA2V2tt+LnlU8RM= 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=fkj8p1SHc4LTcZxf/Gjpvgyfmhti4sgCBlDf4R8FyzQ=; b=UF8/zNdunYc3vw+HDGScWr7u9Sv/PO8mTngUHSZxBBA1fSie/3ktJg0lNGhMBno2pyvoHqt7sUfNe1u24k5G94ezTWk68Vz1kssIZXLHikpgvT5wsq66APwBlhXqvYIqxwcYV5Fs7Zvgw0Q1WeYWsUwj5IPsk/Xht+pHMaOsFmk= 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 1747222090152159.63712613168718; 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-0001Pr-Vu; 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 1uFAH7-0001P2-PV 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 1uFAH6-00028X-2i for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:49 -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-272-A2XlSbumMR24hKRDvFkYww-1; Wed, 14 May 2025 07:27:43 -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 ADAF0180035C; Wed, 14 May 2025 11:27:42 +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 5BECE19560A3; Wed, 14 May 2025 11:27:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222067; 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=fkj8p1SHc4LTcZxf/Gjpvgyfmhti4sgCBlDf4R8FyzQ=; b=B8N15UwgPdj5gwMNMUjqUoUCjthHcrjVTJJTsZmhbm7xtuTk7eg2D1saEZHsmrJxrBpC7Y cVlrXzoSOU9asPMq8qrSZdBIDVYzHqnozymbIX/NgOMx1YlB+3V9NEY87ca2SH5Hq9asO4 0Q2mYBqK7OwjzG+9zbygzGsJML5u0Ms= X-MC-Unique: A2XlSbumMR24hKRDvFkYww-1 X-Mimecast-MFC-AGG-ID: A2XlSbumMR24hKRDvFkYww_1747222062 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 04/13] target/s390x: Rename the qemu_V2_11 feature set to qemu_MIN Date: Wed, 14 May 2025 13:27:24 +0200 Message-ID: <20250514112733.456644-5-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: 1747222092323116600 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-5-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 Sat Nov 15 20:48:55 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 From nobody Sat Nov 15 20:48:55 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=1747222182; cv=none; d=zohomail.com; s=zohoarc; b=ZBQnSB6h6ArZYZ/rJQzeGMAvxKkgLibm8Gl6U+S3/n5TvsyQkfvTIaqElUMggkMSiqDlb8z3akKDbIN4Qun6NBLHXyIeh4H2qlD6Ly4Y2SbLpRHihGsxAuNpcTmCkslGjRmnECSg3QtC/lAhRTV27Pir5zoiy4lYXzBXbD7FH0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222182; 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=qN+lNiOtotga35OUN0kmrY6YpfdgRHjX10o//UKxR1A=; b=brKVaHEx6PAZGjGMMWAmIViiq82L0twKLIPtFBkExRKaLsqE8GeyW4F4sANfTG+TmOSqJTMzAeEu7Z7Uxd8NpakYr3O1NHGli79l4NsxNT1wcGMylGgJwSTP64SmMjDSNjLSA5YM910HRqvBZMjevtj+0rBMg0IvOnwnTupOdJw= 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 1747222182760447.0622893203663; Wed, 14 May 2025 04:29:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHD-0001Qb-Qe; Wed, 14 May 2025 07:27:55 -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 1uFAHB-0001QF-Fc for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:53 -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 1uFAH9-00029E-T4 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:53 -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-657-tH-lM_D_PvKY9BNgj-SaRw-1; Wed, 14 May 2025 07:27:47 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3E7381800447; Wed, 14 May 2025 11:27:46 +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 D354219560A3; Wed, 14 May 2025 11:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222070; 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=qN+lNiOtotga35OUN0kmrY6YpfdgRHjX10o//UKxR1A=; b=RqUtP+nQ21Yn2FUwS/j9bsZiJ6qSMQG45fmMogzJ/jV5EJVwI620dAiShzNON3yQHvaUG3 0QRYDcEvytrlY6bIcXFO0wib0hGoRE1/zlO4YPEbjw2Gc6FXHDnQ/JE6lhIsJ91CzdWtw+ TcHOm8syXNyNQZKvTZ0dqEILZHzUTr0= X-MC-Unique: tH-lM_D_PvKY9BNgj-SaRw-1 X-Mimecast-MFC-AGG-ID: tH-lM_D_PvKY9BNgj-SaRw_1747222066 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 06/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type Date: Wed, 14 May 2025 13:27:26 +0200 Message-ID: <20250514112733.456644-7-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.129.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: 1747222184120019000 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-7-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 db3d26b2e4e..bec4690e857 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1223,21 +1223,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 Sat Nov 15 20:48:55 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=1747222143; cv=none; d=zohomail.com; s=zohoarc; b=RuawJftPOPLc37s5OpgvePMdxxSI9c6SdI1kjZrX9YuxFtvaBN+iRsw6g/rnKDrwae0EdKrhUNgW9Hid1dLvV/mRqxng9/EKccSTiZ+Rb11csBChYzEKHVbuSl/4crPrVIiS9K6OgO4UCxuFZdrm6XgJRoEqMadQc164tpoKedE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222143; 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=wwRDJpGweeeWzHShTIeNusKK4wD5yUVy6zBeHHNs8cA=; b=B490ODSldG8yN3EIQohJa9vqahG19KpPCuf8dETR8gtjmzSO5NegUylxtermDJJsipcpXPeyTeIlcDNGs8crVd0CkhQ6CrKUDbsdQEOd4oN7CPBPwUtNcF6IrOp17xdtjBu5GLuf/D2ol0/77w8XuKvjI8t1D4Pbzmnnl4JaJF4= 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 1747222143847709.3653080084954; Wed, 14 May 2025 04:29:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHF-0001UF-3q; Wed, 14 May 2025 07:27:57 -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 1uFAHB-0001QM-N1 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:53 -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 1uFAH9-000296-RP for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:53 -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-21-b-PRk7CiNou56PbNz-TBpQ-1; Wed, 14 May 2025 07:27:49 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 086091956088; Wed, 14 May 2025 11:27:48 +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 A55D219560A3; Wed, 14 May 2025 11:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222070; 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=wwRDJpGweeeWzHShTIeNusKK4wD5yUVy6zBeHHNs8cA=; b=G0VFPgn/RoyFVAGFlV0QBdWrvFq3G+h77IuC6oTSQ9XJGNLAeZLPQdFFsLWNkg4GHgSQec vtJeG8lyHEfPosvvrvP2LER9V4CG5TQeCabBUON9ZwoLQirHhig36pfgRW/FxrNz3Vm7i7 HPcc4o5irKehOpPaDNQqwdUQ1IaMdYQ= X-MC-Unique: b-PRk7CiNou56PbNz-TBpQ-1 X-Mimecast-MFC-AGG-ID: b-PRk7CiNou56PbNz-TBpQ_1747222068 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 07/13] hw/s390x: Remove the obsolete hpage_1m_allowed switch Date: Wed, 14 May 2025 13:27:27 +0200 Message-ID: <20250514112733.456644-8-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.129.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: 1747222144998116600 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 Message-ID: <20250506062148.306084-8-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 bec4690e857..b013bcd076a 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -748,39 +748,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) @@ -814,7 +781,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; @@ -888,7 +854,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 Sat Nov 15 20:48:55 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=1747222151; cv=none; d=zohomail.com; s=zohoarc; b=TJjHjqCumexfX3swcTOm3abc5R+ELR2er5QL6GOMiPKEZzYeXGamuVTTdqx3aT3tMabWmTxmWGlK5+7YdOpygd9BHxwmAvCfefvQXESksHGcPSwjtYxFS5wQKBMdojMb8NWPAKLyKu2/0S0M8jqQupDYFXpt9Ph0m32/cc9jFP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222151; 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=vlA943oQJGEwAWWws1YgfQMSoX60VXBkTWh3JFNkbH4=; b=NdJH3nut86mEfWbd8d6KJwNecSAHUrk4NSjnXtexXVgf29fuvhLrFOD0ojN2arGe0dWkNo4fuw02T/e/d1CHb8Y/EfLxwQNOGHu2YuCIrVzoxPS5RQFkz/NVU8DtzEbj9V9U3TW707DTEfj4lMTmnk5zSZBtudc+uefx2qLr2R0= 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 1747222151430194.9931010220148; Wed, 14 May 2025 04:29:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHF-0001Uf-HC; Wed, 14 May 2025 07:27:57 -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 1uFAHD-0001Qd-Q7 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:55 -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 1uFAHB-0002BP-Tq for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:55 -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-683-QZyqzEJPM_6vJu6C4jtaMg-1; Wed, 14 May 2025 07:27:50 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BC7861801A24; Wed, 14 May 2025 11:27:49 +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 6C90F19560A3; Wed, 14 May 2025 11:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222073; 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=vlA943oQJGEwAWWws1YgfQMSoX60VXBkTWh3JFNkbH4=; b=gE6poFKw4lnqyiyoi1Oy6OL/HitA/562ae/uNP+Wf3nnVCDIN2ZTusDkwQlzrtaeZfCDUC EXVazTQKLLubEPg71jwHZ+PBi2lnjrM531/puJPmJa9ldsAJ0+oT+j9TTp+PWOsRaJBpUy xFrV/CbYXqAITifFUH4+5fbOBZ3ABUY= X-MC-Unique: QZyqzEJPM_6vJu6C4jtaMg-1 X-Mimecast-MFC-AGG-ID: QZyqzEJPM_6vJu6C4jtaMg_1747222069 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 08/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type Date: Wed, 14 May 2025 13:27:28 +0200 Message-ID: <20250514112733.456644-9-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.129.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: 1747222152042019000 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-9-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 b013bcd076a..95c12a41773 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1172,22 +1172,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 Sat Nov 15 20:48:55 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=1747222137; cv=none; d=zohomail.com; s=zohoarc; b=P35UZbMrMEA5fhjl8tr3JHcts1fge/lJ5zIPTW4eiwRC19OWzq9HHPPpHgsccff0p52Z8K/hiV4bRnniYVwhJQJWyD9lK6UUKxS0JvR4c5oomJLuMSEwgP1IIUKimw1gkZkvGa4R/IqsOWz77kEmmIcuRD6W8OqaAqGJ2O1/F3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222137; 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=rTn/gid945Xe/t0ccsamCqrEKpBUX+j6hvdKHYFqLDU=; b=IAmjv7sg+v5C/iJYhKGn55L40rcxAVw8pwTXDeuCEutb8Qhs2ZzA/WOIq28PzddBpA++WvuUAsGiCLJeNuf7nl+6DmtsKvdAvhBLnTSltJz4yPuCPAgWETVhsnAbiE2r8wiY371unP2IFRKiYRP7kaChSg3s4UjHnR29TO5i27E= 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 1747222137957277.1533961892004; Wed, 14 May 2025 04:28:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHH-0001WW-HL; Wed, 14 May 2025 07:27:59 -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 1uFAHF-0001V0-SO for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:58 -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 1uFAHE-0002CQ-36 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:57 -0400 Received: from mx-prod-mc-02.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-213-TysiRx1pOvixrc01lleAYA-1; Wed, 14 May 2025 07:27:53 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C69101956087; Wed, 14 May 2025 11:27:51 +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 30D9619560B9; Wed, 14 May 2025 11:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222074; 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=rTn/gid945Xe/t0ccsamCqrEKpBUX+j6hvdKHYFqLDU=; b=eaKZ3bLTRDi9ZWoklRJAi7qnV4yy2Iru73QvowMBP6jgklgX2bNR9bSBBBftB9RNVNpgR7 xNW7Zh9hweeWhrV4Q9DwvBF4yxAwL9RpVPkRclpGWyKgk4hWqrUY/GeE33CfnGX8MyyiYA RalQaNonBqRmAPG4TqDeExvXow8e7Wo= X-MC-Unique: TysiRx1pOvixrc01lleAYA-1 X-Mimecast-MFC-AGG-ID: TysiRx1pOvixrc01lleAYA_1747222071 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 09/13] hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 machine type Date: Wed, 14 May 2025 13:27:29 +0200 Message-ID: <20250514112733.456644-10-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.129.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: 1747222140396019000 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250506062148.306084-10-thuth@redhat.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- 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 95c12a41773..431d6b782a8 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1158,20 +1158,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 From nobody Sat Nov 15 20:48:55 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=1747222188; cv=none; d=zohomail.com; s=zohoarc; b=a28vdNQKyFCQYOBvBaCKuPWMvEmrH75E/9tKzx2fH6E8AKqOLBUwDzb5bGTPcMPJw2jHidjfUonsN7LCA2r3IHhJ0K2blk6b7UoHmy2APZ5XT2vplHzlX4KGC/t6e5TyMB9B+2OXF6o815CmXs84JX0+zRvKm4P0B4Wy+la/Qqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222188; 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=TMK/dwdAcqCseMWCo3KAdAF6oQvlt27Nw/U0VtzB3/o=; b=F6msfOrXn9dn7GfI6XjaXjnlJGFgZpb0hHqlPuN9ypf5JypKQ9OQjbjcSlo0nMZYG70TK3WVbA1YI5/quprNOnfJK8/tnOhtl5hXWadnMlkCJj3ZsiE5ZH3gu9dsQXXpZLXZ7X4+CIB4oCLyvY9RJCk+ZLJX/oUCRN5cmilwMnM= 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 1747222188183440.78089992686444; Wed, 14 May 2025 04:29:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHJ-0001XF-CE; Wed, 14 May 2025 07:28:01 -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 1uFAHH-0001WY-Rl for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:59 -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 1uFAHF-0002D5-OZ for qemu-devel@nongnu.org; Wed, 14 May 2025 07:27:59 -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-183-U1rjxvfQOaqo3hqsrQow_A-1; Wed, 14 May 2025 07:27:55 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D1A71195608D; Wed, 14 May 2025 11:27:53 +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 38D5719560A3; Wed, 14 May 2025 11:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222076; 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=TMK/dwdAcqCseMWCo3KAdAF6oQvlt27Nw/U0VtzB3/o=; b=P3p6lYPUtP6Mq/E7El5ZITjGna16OcSdrcONT7p+nL6P8p+WmbD9FImC9J4ovlSwX5Go95 /irvMRixU8Hr9U5KaZZcuGDLJ3XA8Tqia19DySRqDkKC5Qqlddasj/8OQm6qFCG7V6nQ1v VoqCiWA8WEoxOelqOTdGl7JA6kUOdXY= X-MC-Unique: U1rjxvfQOaqo3hqsrQow_A-1 X-Mimecast-MFC-AGG-ID: U1rjxvfQOaqo3hqsrQow_A_1747222074 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , qemu-stable@nongnu.org, Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/13] s390x: Fix leak in machine_set_loadparm Date: Wed, 14 May 2025 13:27:30 +0200 Message-ID: <20250514112733.456644-11-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.129.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: 1747222190158019000 From: Fabiano Rosas ASAN spotted a leaking string in machine_set_loadparm(): Direct leak of 9 byte(s) in 1 object(s) allocated from: #0 0x560ffb5bb379 in malloc ../projects/compiler-rt/lib/asan/asan_mallo= c_linux.cpp:69:3 #1 0x7f1aca926518 in g_malloc ../glib/gmem.c:106 #2 0x7f1aca94113e in g_strdup ../glib/gstrfuncs.c:364 #3 0x560ffc8afbf9 in qobject_input_type_str ../qapi/qobject-input-visit= or.c:542:12 #4 0x560ffc8a80ff in visit_type_str ../qapi/qapi-visit-core.c:349:10 #5 0x560ffbe6053a in machine_set_loadparm ../hw/s390x/s390-virtio-ccw.c= :802:10 #6 0x560ffc0c5e52 in object_property_set ../qom/object.c:1450:5 #7 0x560ffc0d4175 in object_property_set_qobject ../qom/qom-qobject.c:2= 8:10 #8 0x560ffc0c6004 in object_property_set_str ../qom/object.c:1458:15 #9 0x560ffbe2ae60 in update_machine_ipl_properties ../hw/s390x/ipl.c:56= 9:9 #10 0x560ffbe2aa65 in s390_ipl_update_diag308 ../hw/s390x/ipl.c:594:5 #11 0x560ffbdee132 in handle_diag_308 ../target/s390x/diag.c:147:9 #12 0x560ffbebb956 in helper_diag ../target/s390x/tcg/misc_helper.c:137= :9 #13 0x7f1a3c51c730 (/memfd:tcg-jit (deleted)+0x39730) Cc: qemu-stable@nongnu.org Signed-off-by: Fabiano Rosas Message-ID: <20250509174938.25935-1-farosas@suse.de> Fixes: 1fd396e3228 ("s390x: Register TYPE_S390_CCW_MACHINE properties as cl= ass properties") Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 431d6b782a8..f69a4d8ed31 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -771,6 +771,7 @@ static void machine_set_loadparm(Object *obj, Visitor *= v, } =20 s390_ipl_fmt_loadparm(ms->loadparm, val, errp); + g_free(val); } =20 static void ccw_machine_class_init(ObjectClass *oc, const void *data) --=20 2.49.0 From nobody Sat Nov 15 20:48:55 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=1747222215; cv=none; d=zohomail.com; s=zohoarc; b=EOoX4NebWzJ//55K7CJzaVRWawSyo6y+e3X+o3XKc31f7BgLjY+53gsgrnDq4j4hHANWLrfJDfDa7SaeLPXzmtlkJM7FaxNaT/vzjT+eky0/BmzUS7Bk7vHMcq3LTmT32/TIzdBkeeZ+1pYF4vxamBhIq2CD6/Tt+UPm6eG5eBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222215; 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=xGpvN5HOZpVpb1PQIv33QszeyR7R6ATPO+RXsVpq2WI=; b=C6ThwI9orQyzS7YHZp01KdELI2UauDhW9364FcC+BdIxL81NKIKfjSbo1j/942kgM7EVN22jZmDLYUgqk2gZxdVmu8N/oTEqLwakTmyRAwb51mKd/rRXPPzwDo3uzhPwjyBV1X49iQudRHiyZYjuwYTgTR4AYp0q9Iv4wjJz2Q8= 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 1747222215271505.47585777519896; Wed, 14 May 2025 04:30:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHO-0001ZG-5W; Wed, 14 May 2025 07:28:06 -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 1uFAHK-0001Xl-Vy for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28:03 -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 1uFAHI-0002FI-A8 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28: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-64-HOiGmzt3NUy3eyuS4xet0g-1; Wed, 14 May 2025 07:27:56 -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 666111800877; Wed, 14 May 2025 11:27:55 +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 4255919560A3; Wed, 14 May 2025 11:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222079; 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=xGpvN5HOZpVpb1PQIv33QszeyR7R6ATPO+RXsVpq2WI=; b=etRsM4qtFSQvj3iEy8Kb2f7lJy64dcdLkcU4LQy8ycKSHuCe8ecq4QN/UNNBk/9JZ9LmTS ds+roEHNwKDwCc9YzMLTi5T9Z40vdh4OIY0PCznNWtXToFkZKqiJr1e2ldirZ0DpkLyAsA kBk9f7RV5J7jptYLfXh6AAiTx0D0uXg= X-MC-Unique: HOiGmzt3NUy3eyuS4xet0g-1 X-Mimecast-MFC-AGG-ID: HOiGmzt3NUy3eyuS4xet0g_1747222075 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/13] include/hw/dma/xlnx_dpdma: Remove dependency on console.h Date: Wed, 14 May 2025 13:27:31 +0200 Message-ID: <20250514112733.456644-12-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: 1747222215571116600 From: Thomas Huth console.h brings a dependency on the and the pixman header file (if available), so we should avoid to include this file if it is not really necessary. console.h does not seem to be necessary for the xlnx_dpdma code, so drop the include here. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth Message-ID: <20250508144120.163009-2-thuth@redhat.com> --- include/hw/dma/xlnx_dpdma.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h index 1ec0d265be2..484b2e377f0 100644 --- a/include/hw/dma/xlnx_dpdma.h +++ b/include/hw/dma/xlnx_dpdma.h @@ -26,7 +26,6 @@ #define XLNX_DPDMA_H =20 #include "hw/sysbus.h" -#include "ui/console.h" #include "system/dma.h" #include "qom/object.h" =20 --=20 2.49.0 From nobody Sat Nov 15 20:48:55 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=1747222190; cv=none; d=zohomail.com; s=zohoarc; b=Bg7CW8yJIwSsicp6aHB2M6RK8zc9R8tTCd/wn3pQMUUiSIi+EbDPRDhnymVx8hDx6HDRL0wkPV/DKY3pQwXn8oQ2HUvqo+EQU4H23AO9S68JASUxscZyg9yjychh3ZZrYGs2gDXw6f+uFoNRWhK1eRQJBwlyvMaOOMhtTrwGevA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222190; 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=tebOcdVsUZmGmKuubOs74dIf9bed7+mKLbsPO2vTZd0=; b=hJSn/EZtYNThxgU2C7gLOB5aPZQNwNtY0sTFydJihJwelOcmqkfDVH04sKzEbiBrkbU8umFFu8EKmQTcW3+aq04a4ofj/p9ChXveNN/YnozDGuGJNwbwGnmfwI/gUMGnuE9yC6PEdndVwRDUCnaSkgg5fYpYRDrbT6uR2OXUUyU= 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 1747222190955147.5085441970723; Wed, 14 May 2025 04:29:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHK-0001Xi-UF; Wed, 14 May 2025 07:28:02 -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 1uFAHJ-0001XU-LF for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28:01 -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 1uFAHH-0002F0-Mu for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28:01 -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-455-TmbHyj98PUyyRtGkZTUWSQ-1; Wed, 14 May 2025 07:27:57 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4E391800447 for ; Wed, 14 May 2025 11:27:56 +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 CCEC819560A3; Wed, 14 May 2025 11:27:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222078; 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=tebOcdVsUZmGmKuubOs74dIf9bed7+mKLbsPO2vTZd0=; b=CFHX9Z0STEW02tSWB9mQ4j80JFrW4eHmtjKcEHuHYfsPyTLsKu6BSOQlGFArPt3oTZYbli EkCrWelHPregeFgOZMfbItNouXEXwuGe2pSBoR1YQSc3GV3/i32osVs/7BFFQ2GpTqmWCh zNn27micFM8QE1Q+MXIqnicYsH2HJ+o= X-MC-Unique: TmbHyj98PUyyRtGkZTUWSQ-1 X-Mimecast-MFC-AGG-ID: TmbHyj98PUyyRtGkZTUWSQ_1747222076 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 12/13] tests/functional/test_s390x_tuxrun: Check whether the machine is available Date: Wed, 14 May 2025 13:27:32 +0200 Message-ID: <20250514112733.456644-13-thuth@redhat.com> In-Reply-To: <20250514112733.456644-1-thuth@redhat.com> References: <20250514112733.456644-1-thuth@redhat.com> MIME-Version: 1.0 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.129.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: 1747222191354116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The s390x tuxrun test lacks the call to self.set_machine(), so this test is currently failing in case the 's390-ccw-virtio' machine has not been compiled into the binary. Add the check now to fix it. Signed-off-by: Thomas Huth Message-ID: <20250424090640.664217-1-thuth@redhat.com> --- tests/functional/test_s390x_tuxrun.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/test_s390x_tuxrun.py b/tests/functional/test_= s390x_tuxrun.py index a7db4bfd841..8df3c6893b7 100755 --- a/tests/functional/test_s390x_tuxrun.py +++ b/tests/functional/test_s390x_tuxrun.py @@ -24,6 +24,7 @@ class TuxRunS390xTest(TuxRunBaselineTest): 'bff7971fc2fef56372d98afe4557b82fd0a785a241e44c29b058e577ad1bbb44') =20 def test_s390(self): + self.set_machine('s390-ccw-virtio') self.wait_for_shutdown=3DFalse self.common_tuxrun(kernel_asset=3Dself.ASSET_S390X_KERNEL, rootfs_asset=3Dself.ASSET_S390X_ROOTFS, --=20 2.49.0 From nobody Sat Nov 15 20:48:55 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=1747222178; cv=none; d=zohomail.com; s=zohoarc; b=VaQGVLFrJWmq7cgDcQ2P6kZXqhslU3yiX9Vl5JBG+JiiLGYSm9BWeHPSKfH5L9iPVcbXU0sBCWxzmsd9lRGFxLyTTmSjD/14Iq56q558ZMpjhfisB0L+Z/cUS8c2dkEx9h6yKJUsTf5phAmfJ2PAEp5Z3VxPNiIeqgr+UcoxHyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747222178; 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=kBT4hYmsb0TweLp2rWxreoLY89nvdW4z8t01VceREM8=; b=duCbpHCpGujHOFcfZJAfXOgol1/HEyuq7oq11kk2hGRHmQ1K688y65GxgGv8XGeS64qKzYPCPHE63HtDiLfEj0LMbZUoRa40Sq756JJ114UeUl4SQeTk9JZ1mUkJl1TFCHqYledfeYYtyi0URfVFVYz/l8SNGqWXzAKwqisknxU= 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 1747222177993249.48636147888556; Wed, 14 May 2025 04:29:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFAHP-0001ZK-JA; Wed, 14 May 2025 07:28:07 -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 1uFAHL-0001Xx-71 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28:03 -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 1uFAHI-0002Fg-V6 for qemu-devel@nongnu.org; Wed, 14 May 2025 07:28: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-542-_H0Hs5hvO82bMQujnYW9ew-1; Wed, 14 May 2025 07:27:58 -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 1C6D71800115 for ; Wed, 14 May 2025 11:27:58 +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 360F219560A3; Wed, 14 May 2025 11:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747222080; 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=kBT4hYmsb0TweLp2rWxreoLY89nvdW4z8t01VceREM8=; b=f2bmq1wpQyHgj5MJAG7fU/095h4e0DA4wkl997cEXKxZRy+iXS4uknDi7UrtQdTsmN2KUf 1a1ttAoIC8ORmbO0kDmojpZ8TDtk6W2v5CBy8qNyhAKAZwxkdnME+sbSzIVhCB7147DZqu Sa9rJ8WJ9tT1NvRKsRrxEjGWibHFEyE= X-MC-Unique: _H0Hs5hvO82bMQujnYW9ew-1 X-Mimecast-MFC-AGG-ID: _H0Hs5hvO82bMQujnYW9ew_1747222078 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 13/13] tests/functional: Skip the screendump tests if the command is not available Date: Wed, 14 May 2025 13:27:33 +0200 Message-ID: <20250514112733.456644-14-thuth@redhat.com> In-Reply-To: <20250514112733.456644-1-thuth@redhat.com> References: <20250514112733.456644-1-thuth@redhat.com> MIME-Version: 1.0 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: 1747222180208019000 Content-Type: text/plain; charset="utf-8" From: Thomas Huth It is possible nowadays to compile QEMU without pixman support - in that case the screendump command is not available and the related tests fail. Thus skip these tests if the screendump command could not be executed. Signed-off-by: Thomas Huth Message-ID: <20250325081713.283490-2-thuth@redhat.com> --- tests/functional/test_arm_integratorcp.py | 6 ++++-- tests/functional/test_m68k_nextcube.py | 6 ++++-- tests/functional/test_mips64el_malta.py | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/functional/test_arm_integratorcp.py b/tests/functional/t= est_arm_integratorcp.py index a85b339d772..4f00924aa03 100755 --- a/tests/functional/test_arm_integratorcp.py +++ b/tests/functional/test_arm_integratorcp.py @@ -73,8 +73,10 @@ def test_framebuffer_tux_logo(self): framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' wait_for_console_pattern(self, framebuffer_ready) self.vm.cmd('human-monitor-command', command_line=3D'stop') - self.vm.cmd('human-monitor-command', - command_line=3D'screendump %s' % screendump_path) + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screendump_path) + if 'unknown command' in res: + self.skipTest('screendump not available') logger =3D logging.getLogger('framebuffer') =20 cpu_count =3D 1 diff --git a/tests/functional/test_m68k_nextcube.py b/tests/functional/test= _m68k_nextcube.py index ff773a7994f..13c72bd136a 100755 --- a/tests/functional/test_m68k_nextcube.py +++ b/tests/functional/test_m68k_nextcube.py @@ -32,8 +32,10 @@ def check_bootrom_framebuffer(self, screenshot_path): # TODO: wait for the 'displaysurface_create 1120x832' trace-event. time.sleep(2) =20 - self.vm.cmd('human-monitor-command', - command_line=3D'screendump %s' % screenshot_path) + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screenshot_path) + if 'unknown command' in res: + self.skipTest('screendump not available') =20 @skipIfMissingImports("PIL") def test_bootrom_framebuffer_size(self): diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/tes= t_mips64el_malta.py index dd37212f9df..3cc79b74c18 100755 --- a/tests/functional/test_mips64el_malta.py +++ b/tests/functional/test_mips64el_malta.py @@ -155,8 +155,10 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_cou= nt): framebuffer_ready =3D 'Console: switching to colour frame buffer d= evice' self.wait_for_console_pattern(framebuffer_ready) self.vm.cmd('human-monitor-command', command_line=3D'stop') - self.vm.cmd('human-monitor-command', - command_line=3D'screendump %s' % screendump_path) + res =3D self.vm.cmd('human-monitor-command', + command_line=3D'screendump %s' % screendump_path) + if 'unknown command' in res: + self.skipTest('screendump not available') logger =3D logging.getLogger('framebuffer') =20 match_threshold =3D 0.95 --=20 2.49.0