From nobody Fri Nov 14 16:55:20 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=1761055208; cv=none; d=zohomail.com; s=zohoarc; b=ReZZbsHuxXgYGll9c960hXrrf5bVQKONr2M3c+UcsW32zkkZArNaBULqA9CQXjkXFkOFVUDzj02ahH7ywILKkc6l1NrN/GD9oXzFIgrD0xEYRedPQ//lqPuzf4QXwdzTHBCuyZk5y2TLDsa421HjU65IY3Pht6J0jVa7+XhX6pw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055208; 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=2LASpbnvht/YRs8V6TqUYEzVhvHS/fJVgPnoGaPTlRA=; b=jtvTEMeKIBA06lHOlf5jBJ99r43FeppJYRoaruzt/5dfTipWOxcNsxzl1YOrtZSJqKqQ+7BKSVlKoA4e8IUg+mIAKSNl1Noa+wZc7zpIXuYrd/XUGn6WwG7Lt3kOOiXk41JdcUMltZnvRApbrSMcVzpvMP2awYioaZBsZUhPsvM= 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 1761055208913258.65157027616465; Tue, 21 Oct 2025 07:00:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCs3-0000F1-Uw; Tue, 21 Oct 2025 09:57:53 -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 1vBCs0-0000DI-Mi for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:48 -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 1vBCry-0007wi-DZ for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:48 -0400 Received: from mx-prod-mc-03.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-519--2jaLvmdMDKuUkIuQ0NSQA-1; Tue, 21 Oct 2025 09:57:41 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC4CD1956050; Tue, 21 Oct 2025 13:57:39 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8DFD419560A2; Tue, 21 Oct 2025 13:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055065; 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=2LASpbnvht/YRs8V6TqUYEzVhvHS/fJVgPnoGaPTlRA=; b=WxJ2qdT64cdhue3q9jRsHeotu8/VLR1E+wdXdd9suuFmVxk9D9yFTvSV0nbiS4vxoYkOlp 5tWtZ1Rj+VGijBXYM1HgMmPTmqUH34R40fsbh2shnGQHoLJO+4LN+4RoEgw/G6E+L+C1rp bV6UBy71cgRunDLoJcEt4Ieo23E1iek= X-MC-Unique: -2jaLvmdMDKuUkIuQ0NSQA-1 X-Mimecast-MFC-AGG-ID: -2jaLvmdMDKuUkIuQ0NSQA_1761055060 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Shalini Chellathurai Saroja , Hendrik Brueckner Subject: [PULL 1/6] qapi/machine-s390x: add QAPI event SCLP_CPI_INFO_AVAILABLE Date: Tue, 21 Oct 2025 15:57:30 +0200 Message-ID: <20251021135735.96145-2-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055211140154100 Content-Type: text/plain; charset="utf-8" From: Shalini Chellathurai Saroja Add QAPI event SCLP_CPI_INFO_AVAILABLE to notify the availability of Control-Program Identification data in QOM. Signed-off-by: Shalini Chellathurai Saroja Suggested-by: Thomas Huth Reviewed-by: Hendrik Brueckner Reviewed-by: Thomas Huth Message-ID: <20251016121708.334133-1-shalini@linux.ibm.com> Signed-off-by: Thomas Huth --- qapi/machine-s390x.json | 21 +++++++++++++++++++++ hw/s390x/sclpcpi.c | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/qapi/machine-s390x.json b/qapi/machine-s390x.json index 966dbd61d2e..8412668b671 100644 --- a/qapi/machine-s390x.json +++ b/qapi/machine-s390x.json @@ -119,3 +119,24 @@ { 'command': 'query-s390x-cpu-polarization', 'returns': 'CpuPolarizationIn= fo', 'features': [ 'unstable' ] } + +## +# @SCLP_CPI_INFO_AVAILABLE: +# +# Emitted when the Control-Program Identification data is available +# in the QOM tree. +# +# Features: +# +# @unstable: This event is experimental. +# +# Since: 10.2 +# +# .. qmp-example:: +# +# <- { "event": "SCLP_CPI_INFO_AVAILABLE", +# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } } +## +{ 'event': 'SCLP_CPI_INFO_AVAILABLE', + 'features': [ 'unstable' ] +} diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c index 7aa039d5100..68fc1b809bf 100644 --- a/hw/s390x/sclpcpi.c +++ b/hw/s390x/sclpcpi.c @@ -54,6 +54,7 @@ #include "hw/s390x/event-facility.h" #include "hw/s390x/ebcdic.h" #include "qapi/qapi-visit-machine.h" +#include "qapi/qapi-events-machine-s390x.h" #include "migration/vmstate.h" =20 typedef struct Data { @@ -106,6 +107,9 @@ static int write_event_data(SCLPEvent *event, EventBuff= erHeader *evt_buf_hdr) e->timestamp =3D qemu_clock_get_ns(QEMU_CLOCK_HOST); =20 cpim->ebh.flags =3D SCLP_EVENT_BUFFER_ACCEPTED; + + qapi_event_send_sclp_cpi_info_available(); + return SCLP_RC_NORMAL_COMPLETION; } =20 --=20 2.51.0 From nobody Fri Nov 14 16:55:20 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=1761055211; cv=none; d=zohomail.com; s=zohoarc; b=IelmwOaat0RjU/XwYNQN0KejOnD2ZJQ0JUfRczFBS1PWQ4KUaPOK3KwENRluhKhiF1bVib/6MCZW/IjsORrHNll3CbyJh3IaC1I1msgIzDA67kPh+Rh2K7coS+siDzAciTwkJMggQ206xp0E4v7vlabyNQBSGHFJa+O1Vi5cTgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055211; 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=K2L/Jxby2ZpFPnIqwqvxM/ykVi8YDoUxBU6sV7v8gSk=; b=GVNfFOObhR5eK+iwXYjAGIWm4Bhi79dZId5zW5bFWpbLuIDqsp167WVv4XSHEQ6Kfdxz66gugu4sJhaEWvDN/WHiSAUfz8HfOFaPR1hITxiNw7O1FGlyz4n5PbKjankoJw0lY0QN8+3xyKoWx0bb/7TjL+ETzo2GE7kiH+mxYu0= 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 1761055211141201.58596756675513; Tue, 21 Oct 2025 07:00:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCs7-0000Fq-2j; Tue, 21 Oct 2025 09:57: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 1vBCs2-0000Di-47 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:50 -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 1vBCs0-0007ws-43 for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:49 -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-375-IOqRt3DgOBWgR0o-I84kng-1; Tue, 21 Oct 2025 09:57:43 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 98DEC18002DD; Tue, 21 Oct 2025 13:57:41 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4CD0D19560A2; Tue, 21 Oct 2025 13:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055067; 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=K2L/Jxby2ZpFPnIqwqvxM/ykVi8YDoUxBU6sV7v8gSk=; b=JAGVZGUMhihbklCwED+NiFaZmt5sbjKCGO284UFttUOtXs+W2iLd+662JjQCRu8CaMOFXm XMA16QjgkLllxEjFeqPjviFIK4ejlm6eBiDw5wvFnvrzcMWe1TT1OxogwvQMJ1Z4dKKi/s Nlir1JfMgLPkGp7g+vIsIyaRpITj3ug= X-MC-Unique: IOqRt3DgOBWgR0o-I84kng-1 X-Mimecast-MFC-AGG-ID: IOqRt3DgOBWgR0o-I84kng_1761055061 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Shalini Chellathurai Saroja , Hendrik Brueckner Subject: [PULL 2/6] tests/functional: add tests for SCLP event CPI Date: Tue, 21 Oct 2025 15:57:31 +0200 Message-ID: <20251021135735.96145-3-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055215035154100 Content-Type: text/plain; charset="utf-8" From: Shalini Chellathurai Saroja Add tests for SCLP event type Control-Program Identification. Signed-off-by: Shalini Chellathurai Saroja Suggested-by: Thomas Huth Reviewed-by: Hendrik Brueckner Reviewed-by Thomas Huth Message-ID: <20251016121708.334133-2-shalini@linux.ibm.com> Signed-off-by: Thomas Huth Reviewed-by Thomas Huth --- tests/functional/s390x/test_ccw_virtio.py | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/functional/s390x/test_ccw_virtio.py b/tests/functional/s= 390x/test_ccw_virtio.py index 453711aa0f5..04553378567 100755 --- a/tests/functional/s390x/test_ccw_virtio.py +++ b/tests/functional/s390x/test_ccw_virtio.py @@ -15,6 +15,7 @@ import tempfile =20 from qemu_test import QemuSystemTest, Asset +from qemu_test import exec_command from qemu_test import exec_command_and_wait_for_pattern from qemu_test import wait_for_console_pattern =20 @@ -270,5 +271,30 @@ def test_s390x_fedora(self): 'while ! (dmesg -c | grep Start.virtcrypto_remove)= ; do' ' sleep 1 ; done', 'Start virtcrypto_remove.') =20 + # Test SCLP event Control-Program Identification (CPI) + cpi =3D '/sys/firmware/cpi/' + sclpcpi =3D '/machine/sclp/s390-sclp-event-facility/sclpcpi' + self.log.info("Test SCLP event CPI") + exec_command(self, 'echo TESTVM > ' + cpi + 'system_name') + exec_command(self, 'echo LINUX > ' + cpi + 'system_type') + exec_command(self, 'echo TESTPLEX > ' + cpi + 'sysplex_name') + exec_command(self, 'echo 0x001a000000060b00 > ' + cpi + 'system_le= vel') + exec_command_and_wait_for_pattern(self, + 'echo 1 > ' + cpi + 'set', ':/#') + try: + event =3D self.vm.event_wait('SCLP_CPI_INFO_AVAILABLE') + except TimeoutError: + self.fail('Timed out waiting for the SCLP_CPI_INFO_AVAILABLE e= vent') + ts =3D self.vm.cmd('qom-get', path=3Dsclpcpi, property=3D'timestam= p') + self.assertNotEqual(ts, 0) + name =3D self.vm.cmd('qom-get', path=3Dsclpcpi, property=3D'system= _name') + self.assertEqual(name.strip(), 'TESTVM') + typ =3D self.vm.cmd('qom-get', path=3Dsclpcpi, property=3D'system_= type') + self.assertEqual(typ.strip(), 'LINUX') + sysplex =3D self.vm.cmd('qom-get', path=3Dsclpcpi, property=3D'sys= plex_name') + self.assertEqual(sysplex.strip(), 'TESTPLEX') + level =3D self.vm.cmd('qom-get', path=3Dsclpcpi, property=3D'syste= m_level') + self.assertEqual(level, 0x001a000000060b00) + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.51.0 From nobody Fri Nov 14 16:55:20 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=1761055173; cv=none; d=zohomail.com; s=zohoarc; b=P04T8EaoYU+KXwm2FBaJjIg69zTl+FnUc0tibLbU2Caj/TsXqKra2mJDWxll0e02BcslbvcCNu/mP9O+1e/y838q3Ztywa/JyfjUxWH8oi1jgKvbGtbvjdjrbIPJFAeSHFF8TtOm9FSA4Wz5aWWTQ5Wn0y0B7KvDNZ2J3R5PeY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055173; 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=vt6uwhyIK+73+a2uJbub1PjgJdGjN+jo4yTjn3+Yv3w=; b=MpO8XttZrRwnt0enMjwPcAAMrbH9lorJBw4yua4oe1GB18nLUQRGlSrgRoS9x9f0jO9WmQgQ/pDRAcua3Oz4cfT0pg+fwwH5QBpulGlG8wihTQAUPV72OucLNl35tFE3GhASwnqhEkvTWOZG7mCwBU5RjblwOxrpyjfysSVTahQ= 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 17610551731031019.1198945080912; Tue, 21 Oct 2025 06:59:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCs8-0000GC-8r; Tue, 21 Oct 2025 09:57:56 -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 1vBCs3-0000Em-Af for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:51 -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 1vBCs1-0007x5-8n for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:51 -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-655-lHsfAsHgMiG0WcsMKvDoxQ-1; Tue, 21 Oct 2025 09:57:44 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 27219195609F; Tue, 21 Oct 2025 13:57:43 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 090DB19560A2; Tue, 21 Oct 2025 13:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055068; 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=vt6uwhyIK+73+a2uJbub1PjgJdGjN+jo4yTjn3+Yv3w=; b=IetEASl5o8w7yg3pShMovXlrz62Kk1c0WzlaMBFOOnQxlinKMw+a7GKpgHJjUbYVjikzyG NeHid+ujT/KKpNp9u8v6PoWcApQSak9M3pUAA/J0W8jBPjrntWzm4Ld4bXMLb9YZ0RqRFg Aa5a8pI4fGWgcgVoZP9zVyjhlL1FWi4= X-MC-Unique: lHsfAsHgMiG0WcsMKvDoxQ-1 X-Mimecast-MFC-AGG-ID: lHsfAsHgMiG0WcsMKvDoxQ_1761055063 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 3/6] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine Date: Tue, 21 Oct 2025 15:57:32 +0200 Message-ID: <20251021135735.96145-4-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-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.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055173936158500 From: Philippe Mathieu-Daud=C3=A9 This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20251020094903.72182-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index ad2c48188a8..64b81345f1e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -715,26 +715,6 @@ static void s390_nmi(NMIState *n, int cpu_index, Error= **errp) s390_cpu_restart(S390_CPU(cs)); } =20 -static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) -{ - /* same logic as in sclp.c */ - int increment_size =3D 20; - ram_addr_t newsz; - - while ((sz >> increment_size) > MAX_STORAGE_INCREMENTS) { - increment_size++; - } - newsz =3D sz >> increment_size << increment_size; - - if (sz !=3D newsz) { - qemu_printf("Ram size %" PRIu64 "MB was fixed up to %" PRIu64 - "MB to match machine restrictions. Consider updating " - "the guest definition.\n", (uint64_t) (sz / MiB), - (uint64_t) (newsz / MiB)); - } - return newsz; -} - static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp) { S390CcwMachineState *ms =3D S390_CCW_MACHINE(obj); @@ -1165,19 +1145,6 @@ static void ccw_machine_5_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(5, 0); =20 -static void ccw_machine_4_2_instance_options(MachineState *machine) -{ - ccw_machine_5_0_instance_options(machine); -} - -static void ccw_machine_4_2_class_options(MachineClass *mc) -{ - ccw_machine_5_0_class_options(mc); - mc->fixup_ram_size =3D s390_fixup_ram_size; - compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); -} -DEFINE_CCW_MACHINE(4, 2); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:55:20 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=1761055207; cv=none; d=zohomail.com; s=zohoarc; b=DMZ3GEDG4s8mBuSIbPNV6/ycAOgZDjgp3a69Dio5qImsfPpA/IKwMKk9s2DvEHnHa3UahH9q5EQNWxy1dr91QShxPfmBR02UUIlgWMma02TFJHh0X2HPmG7UOVdwUsxS5BVxm0IPwtfVSN6gKVAWNdzE+tqxNbsLqaecvxGcAc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055207; 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=FEfPs3lE3YKqxHYGpmEEm9huybksF3x8fh52qUpukbg=; b=fuk58gXIGsQm2267QKqsgmxPE5kcrIzGhzcnnf6PKcIpXjFNQWqN9T/mMZGwXJg/MJwujOvhUOm2oR7Crlew2NLMHdoeDNLerJkXeZt3el6MRCrKEzHDFedyyA+CO3D9MXJAgd3Lh7YwryDxfRBiE5DceNPUET4Yp89E3Sm+jFU= 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 1761055207863943.1318412564276; Tue, 21 Oct 2025 07:00:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCs7-0000Ft-Ff; Tue, 21 Oct 2025 09:57: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 1vBCs3-0000F2-MP for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:51 -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 1vBCs1-0007xK-NU for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:51 -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-455-pMJx3pEsN8qDYpIbktseFA-1; Tue, 21 Oct 2025 09:57:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 A3D1A195609D; Tue, 21 Oct 2025 13:57:44 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8B76519560A2; Tue, 21 Oct 2025 13:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055068; 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=FEfPs3lE3YKqxHYGpmEEm9huybksF3x8fh52qUpukbg=; b=N3ZOid3op/tjqtO5UUm7JqsyDMMeMc91fUTRcZTI0U0uE3bRvWowjz85baOYwDxY8cLKK1 tE0PpYGN6mbLnOGrwUR8z34xejgDNtHPq2CzpfagRN1o+oToA12G6ja22LzWGBTDebdGIQ BumhjH/OmfeCAWRv0Vd0jvaaxTH4ZHQ= X-MC-Unique: pMJx3pEsN8qDYpIbktseFA-1 X-Mimecast-MFC-AGG-ID: pMJx3pEsN8qDYpIbktseFA_1761055064 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 4/6] hw/s390x/ccw: Remove SCLPDevice::increment_size field Date: Tue, 21 Oct 2025 15:57:33 +0200 Message-ID: <20251021135735.96145-5-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-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.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055214622158500 From: Philippe Mathieu-Daud=C3=A9 The SCLPDevice::increment_size field was only used by the s390-ccw-virtio-4.2 machine, which got removed. Remove it as now unused, along with the sclp_memory_init() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20251020094903.72182-3-philmd@linaro.org> Signed-off-by: Thomas Huth --- include/hw/s390x/sclp.h | 5 +---- hw/s390x/sclp.c | 34 +++------------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index d32f6180e0d..33f01f85bb1 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -197,12 +197,9 @@ OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass, struct SCLPEventFacility; =20 struct SCLPDevice { - /* private */ DeviceState parent_obj; - struct SCLPEventFacility *event_facility; - int increment_size; =20 - /* public */ + struct SCLPEventFacility *event_facility; }; =20 struct SCLPDeviceClass { diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 8602a566a49..c9a9c4bb375 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -110,7 +110,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) ReadInfo *read_info =3D (ReadInfo *) sccb; MachineState *machine =3D MACHINE(qdev_get_machine()); int cpu_count; - int rnsize, rnmax; + int rnmax; int required_len =3D SCCB_REQ_LEN(ReadInfo, machine->possible_cpus->le= n); int offset_cpu =3D s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) ? offsetof(ReadInfo, entries) : @@ -153,21 +153,14 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *scc= b) =20 read_info->mha_pow =3D s390_get_mha_pow(); read_info->hmfai =3D cpu_to_be32(s390_get_hmfai()); - - rnsize =3D 1 << (sclp->increment_size - 20); - if (rnsize <=3D 128) { - read_info->rnsize =3D rnsize; - } else { - read_info->rnsize =3D 0; - read_info->rnsize2 =3D cpu_to_be32(rnsize); - } + read_info->rnsize =3D 1; =20 /* * We don't support standby memory. maxram_size is used for sizing the * memory device region, which is not exposed through SCLP but through * diag500. */ - rnmax =3D machine->ram_size >> sclp->increment_size; + rnmax =3D machine->ram_size >> 20; if (rnmax < 0x10000) { read_info->rnmax =3D cpu_to_be16(rnmax); } else { @@ -406,25 +399,6 @@ static void sclp_realize(DeviceState *dev, Error **err= p) } } =20 -static void sclp_memory_init(SCLPDevice *sclp) -{ - MachineState *machine =3D MACHINE(qdev_get_machine()); - MachineClass *machine_class =3D MACHINE_GET_CLASS(qdev_get_machine()); - ram_addr_t initial_mem =3D machine->ram_size; - int increment_size =3D 20; - - /* The storage increment size is a multiple of 1M and is a power of 2. - * For some machine types, the number of storage increments must be - * MAX_STORAGE_INCREMENTS or fewer. - * The variable 'increment_size' is an exponent of 2 that can be - * used to calculate the size (in bytes) of an increment. */ - while (machine_class->fixup_ram_size !=3D NULL && - (initial_mem >> increment_size) > MAX_STORAGE_INCREMENTS) { - increment_size++; - } - sclp->increment_size =3D increment_size; -} - static void sclp_init(Object *obj) { SCLPDevice *sclp =3D SCLP(obj); @@ -434,8 +408,6 @@ static void sclp_init(Object *obj) object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new); object_unref(new); sclp->event_facility =3D EVENT_FACILITY(new); - - sclp_memory_init(sclp); } =20 static void sclp_class_init(ObjectClass *oc, const void *data) --=20 2.51.0 From nobody Fri Nov 14 16:55:20 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=1761055152; cv=none; d=zohomail.com; s=zohoarc; b=ZlxAy7dm+VPAqkxopSYhi8ZzGlbKWbzJW+I+7lVfqOAaik2GkgcQ/atr3KVqdRYYErjeNO2DpFnb2QCJ/GHnqV9jWLbD+xch1N8bM4sf4MOJObWuxq+1a3vk7XcXMMst1e62ogVW4JArBq3baUmeKmJg4ENZU/Joq4OMbwPQdVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055152; 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=pGAIDv42ZLXGZFlnkWXLQ50dypdaStkaWhAB27BHzxE=; b=DzzLMeU5ew5yTZ63H2LF5fnh9mC9Yt5rkWUT59f4jQpO6tX/AkPBB7ZNlVHYAOciBhj8kW4By8+ojEQmu9gQCqCWcyc6OakZqfbp47yYNkgnyID0QoOuTBqQgcNfzHNjpDRnupn9qY2JjYaaYyd3UBwNx06aixObZS9kk64pHAQ= 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 1761055152227262.88582061281625; Tue, 21 Oct 2025 06:59:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCsd-0000RN-2d; Tue, 21 Oct 2025 09:58:28 -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 1vBCs8-0000G4-3d for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:56 -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 1vBCs6-0007xm-0V for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:55 -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-228-efk3NYn8OA60PgaYQXK3rw-1; Tue, 21 Oct 2025 09:57:47 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 2D03719560A3; Tue, 21 Oct 2025 13:57:46 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1382119560A2; Tue, 21 Oct 2025 13:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055071; 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=pGAIDv42ZLXGZFlnkWXLQ50dypdaStkaWhAB27BHzxE=; b=ADbtasHfM0Rh+yyJq1rUotaRa/EMORjX4yWaTRJrNDFj2Gw3lhvVA5zU1HYEjy/Vf9/n5e k0lQ6UERtDgPBfXxZstUEq1Prd7wwoTvdEFJcUsYLkKkney4vNkdWa0LnlvBdQcEMRiJHj HYHXk2FdBUAgW2paWlx8P42lzFtrsOQ= X-MC-Unique: efk3NYn8OA60PgaYQXK3rw-1 X-Mimecast-MFC-AGG-ID: efk3NYn8OA60PgaYQXK3rw_1761055066 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 5/6] hw/core/machine: Remove MachineClass::fixup_ram_size callback Date: Tue, 21 Oct 2025 15:57:34 +0200 Message-ID: <20251021135735.96145-6-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-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.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055154303154100 From: Philippe Mathieu-Daud=C3=A9 The MachineClass::fixup_ram_size callback, which was added in commit 5c30ef937f5 ("vl/s390x: fixup ram sizes for compat machines"), was only used by the s390-ccw-virtio-4.2 machine, which got removed. Remove it as now unused. Reported-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-ID: <20251020094903.72182-4-philmd@linaro.org> Signed-off-by: Thomas Huth --- include/hw/boards.h | 7 ------- hw/core/machine.c | 3 --- 2 files changed, 10 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 665b6201214..d0a69cd490b 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -250,12 +250,6 @@ typedef struct { * It also will be used as a way to option into "-m" option support. * If it's not set by board, '-m' will be ignored and generic code will * not create default RAM MemoryRegion. - * @fixup_ram_size: - * Amends user provided ram size (with -m option) using machine - * specific algorithm. To be used by old machine types for compat - * purposes only. - * Applies only to default memory backend, i.e., explicit memory backend - * wasn't used. * @smbios_memory_device_size: * Default size of memory device, * SMBIOS 3.1.0 "7.18 Memory Device (Type 17)" @@ -325,7 +319,6 @@ struct MachineClass { unsigned cpu_inde= x); const CPUArchIdList *(*possible_cpu_arch_ids)(MachineState *machine); int64_t (*get_default_cpu_node_id)(const MachineState *ms, int idx); - ram_addr_t (*fixup_ram_size)(ram_addr_t size); uint64_t smbios_memory_device_size; bool (*create_default_memdev)(MachineState *ms, const char *path, Error **errp); diff --git a/hw/core/machine.c b/hw/core/machine.c index 681adbb7ac5..7aec3916e80 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -648,9 +648,6 @@ static void machine_set_mem(Object *obj, Visitor *v, co= nst char *name, mem->size =3D mc->default_ram_size; } mem->size =3D QEMU_ALIGN_UP(mem->size, 8192); - if (mc->fixup_ram_size) { - mem->size =3D mc->fixup_ram_size(mem->size); - } if ((ram_addr_t)mem->size !=3D mem->size) { error_setg(errp, "ram size %llu exceeds permitted maximum %llu", (unsigned long long)mem->size, --=20 2.51.0 From nobody Fri Nov 14 16:55:20 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=1761055139; cv=none; d=zohomail.com; s=zohoarc; b=i4Otb20XlGoJAAksIcZiD1MjVe09zCNl4zYPWBovdJkMHxWx//YI/0j6BYsgd3lJYWt+D+oPd8lNnwRA29t4oNplpCBr26tdS4l2qvCIzyX4fgAGEJ44h7mBWj+/VzYftyph90LL+swYG1SCPUtQ1wYlgpi/hwj5y+v+mDPKdAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761055139; 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=nMX5dMJBLwOdR9O82a01i56scmDpujZek0VL+du5ZCo=; b=KE3BPfuArkdfZ9qVbpAk9vfc4mVoUJPuU8X5NW0VPJ4ubYjHfcmL4+Xh7nP0IQjTmj4b8cariRBc7ldTZCkNJW96mN2DQy+EuK7dp2BAgdfnAy8/aM8SoqXrxwgGIyOdehjT8aohWMqomuyOIpzKTBz/EBrwPSIsdlYkP/81unQ= 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 1761055138668500.57071840537117; Tue, 21 Oct 2025 06:58:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBCsJ-0000H9-Cc; Tue, 21 Oct 2025 09:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vBCs8-0000G3-1j for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:56 -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 1vBCs4-0007xq-Bl for qemu-devel@nongnu.org; Tue, 21 Oct 2025 09:57:55 -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-683-lRwNOAFrOeWOHelZ36i2_Q-1; Tue, 21 Oct 2025 09:57:49 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 2556D1808985; Tue, 21 Oct 2025 13:57:48 +0000 (UTC) Received: from thuth-p1g4.str.redhat.com (dhcp-192-176.str.redhat.com [10.33.192.176]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CC8DB19560B0; Tue, 21 Oct 2025 13:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761055071; 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=nMX5dMJBLwOdR9O82a01i56scmDpujZek0VL+du5ZCo=; b=QJUfI+jvWwAJqY3lbWsaG/Ud98p5G5bHU59nC3wI18lrEP5SJE0XuHlAb4iPiNwXZddo7E YVUuqKFbyZ1GTbGf/xDQ7LauIoof27EY5HD2bwo/6k0tfBTDlJfpF/ZOqiBkAgwA+brGTE HLZqGdkIoWTaWnLDiBoN4wFMLgAYCPw= X-MC-Unique: lRwNOAFrOeWOHelZ36i2_Q-1 X-Mimecast-MFC-AGG-ID: lRwNOAFrOeWOHelZ36i2_Q_1761055068 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 6/6] gitlab-ci: Decrease the size of the compiler cache Date: Tue, 21 Oct 2025 15:57:35 +0200 Message-ID: <20251021135735.96145-7-thuth@redhat.com> In-Reply-To: <20251021135735.96145-1-thuth@redhat.com> References: <20251021135735.96145-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.12 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 1761055144220154100 From: Thomas Huth Uploading the cache from the runner takes a long time in the MSYS2 job, mostly due to the size of the compiler cache. However, looking at runs with a non-poluted cache, it seems like you can get a build with a 99% hit rate already with ~ 160 MiB cache size, so the compiler cache with 500 MiB certainly contains a lot of stale files. Thus decrease the size of the ccache to a more reasonable value to speed up the MSYS2 job in our CI. While at it, also add a "du -sh" for the build folder to get a better feeling for the amount of object code that is required for the build, and publish the list of files in /var/cache to be able to better analyze what is really clogging our cache here. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth Message-ID: <20251020161759.50241-1-thuth@redhat.com> --- .gitlab-ci.d/windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 6e1135d8b86..5dbdabfbec0 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -25,6 +25,7 @@ msys2-64bit: expire_in: 7 days paths: - build/meson-logs + - build/cache-log.txt reports: junit: build/meson-logs/*.junit.xml before_script: @@ -94,7 +95,7 @@ msys2-64bit: - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - $env:CCACHE_BASEDIR =3D "$env:CI_PROJECT_DIR" - $env:CCACHE_DIR =3D "$env:CCACHE_BASEDIR/ccache" - - $env:CCACHE_MAXSIZE =3D "500M" + - $env:CCACHE_MAXSIZE =3D "180M" - $env:CCACHE_DEPEND =3D 1 # cache misses are too expensive with preproc= essor mode - $env:CC =3D "ccache gcc" - mkdir build @@ -103,5 +104,7 @@ msys2-64bit: - ..\msys64\usr\bin\bash -lc "../configure $CONFIGURE_ARGS" - ..\msys64\usr\bin\bash -lc "make -j$env:JOBS" - ..\msys64\usr\bin\bash -lc "make check MTESTARGS=3D'$TEST_ARGS' || { c= at meson-logs/testlog.txt; exit 1; } ;" + - ..\msys64\usr\bin\bash -lc "ls -lR /var/cache > cache-log.txt" + - ..\msys64\usr\bin\bash -lc "du -sh ." - ..\msys64\usr\bin\bash -lc "ccache --show-stats" - Write-Output "Finished build at $(Get-Date -Format u)" --=20 2.51.0