From nobody Fri Nov 14 16:53:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760953808; cv=none; d=zohomail.com; s=zohoarc; b=X31Kdy3POmtjcrhl7Ksu21rh/ZALri60OyPkn0vSF9YL9eBX4m9hgEJEFIWjKySuxtWxv8ONAaMON8CmUB9wjfioXrqPfILmURpFyIOxaMzbmPIpLcAODwZkQrNboxcCDMcs/XaWU9WyWWyekGLPIQgrInZeya0zI9TphDfKda4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760953808; 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=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=UI8zKVHbq0pT9pDUt4YsdL4rgMVyYuCs5GmmiVNAvDw+yU2ZIkrovGSUbEVtp+tlH0KRQl4qlAkJM7LuJua3ypgXyTLqUtfchRsQn9oGe7LHe2rLvdRXzWu3nhEDgu4y3YnHpRQsp4EVUeG0n+zxV413vhXPK9NphgSL0FPprVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760953808888632.14132257571; Mon, 20 Oct 2025 02:50:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAmVx-00075Z-RE; Mon, 20 Oct 2025 05:49:17 -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 1vAmVv-000750-0Q for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:15 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAmVt-0001dM-6s for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:14 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-471076f819bso33175165e9.3 for ; Mon, 20 Oct 2025 02:49:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711442d6c6sm216578845e9.6.2025.10.20.02.49.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 02:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760953750; x=1761558550; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=vbjQhIDR6JBGTVWD/Eljeo3OWKpGn9WhwNnSRnvYwFs3QUcfLXPknYOVnszMYGHzpP tjEj6an7it6fsI0v1YU8nsF7Y+rms4u9K2zC8JrxWf0eFTACkyI9OrTMLWkcArl0z5wM GMPD60kNLT8QAr6JHxjVGayHqFMKJVjVOA1Dq6v0wON6ItJNWEswekFQFOW/Li1Ej5Vs He7YOKKU3xdz+SXTuWEkrgvc1Ltidi1iasCZPtlLaEvWQF/HQk/BcWjLoJR0yp1bo318 KBYQUzrljB5Db5Oeho0YPLuWsQChwgtk/Y3OO9FnuJZCZp6mQxGjZX46RbcnOCJA6/WP tbFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760953750; x=1761558550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=MsyPxvabUGKb8a/RbVVLKDwHVD/xl44zZYuYkswHuERM6MuhXz/Tl74nSq43BFxwDP QJ1MgvRE8yz2NvoKaJVx/vB4CBhKiHagzkNlKaBQnjs6IbC01XvapYYKB4snGhfjkzQk yt9HekqqpML+csynd+8AEnf9QQT5+F9FgP1Z/u/NV/K84Zpo+MmLL0Yl3UWFalto9v5Z Xary+7hkRhdEZ9NQA2LkBjSo8RHhxjX3eWHpMkoAC2+l7XsDJJJgEBEhddDZlXsT0mYu 8hzqL+vj3+GhTbAtbpz/IC0rP7m32/ppKh9JocBEfpKZ75fIG4bdbj8p0Ci48WX1rHWR FFuQ== X-Gm-Message-State: AOJu0YxVtbWUiMskJMAZkcuIwvf90v9nVdNJAowMRUse077HX0NXQ9e3 zCR+qGxwA8Cw/ovAWwZIwYEguIeCTJm9WJWTTvW+n+hBtP38xMLcBX57XULrM+ENsRKzyyB9eft ghp1srFk= X-Gm-Gg: ASbGncuH3mm/yxuOcSX76+1lWsobaUbhjP14mXqaee6oaFnxqEPESpqtCW/YR9wDqwR LxpjzMJ5Lu9QForqaYs2s1i+yuTJSuFGhswIOnEj0MqlTEYZRorShMG83jsqCZaEIKPOWLYRjT2 mdsbqY0Xr4lklmrcYeCUq/WyKjaadZ7q+gH48Xoq8HMmuGixujPsPKgrKnLDI29OmT7jp7kEAri BCMN224QDJNmJgp0fBxmnKlqwRDuOhg4PSt5MGMNuIAd5zCAasWqFjfnY6vd1+n0/QFZRSjfkRs wA2w8da46SwmSkRDY2aTdOEVBtGoI22vttX7i8mxgSrRqpS2nsjVFi77ErDOtcByoH1nW78AyLs kW2UFFyoR8kyhRC4xJB52IQGs2ryQEUQawA0rXPPoPTJS4HAaxXWwbvDyr0N5oznTOSIXnN+qmT F/STKTDzBYMFYfMf81KlG4w25wug9XSXznYfkVAv/HuN7IPub22m17h89KS5jXY9JSirxyekM= X-Google-Smtp-Source: AGHT+IEOD348iuHr6ywW2js24djhFGfz7W33unbZqE2zoiAS9OpAq2JBOSB/Negj+LaIlFH7rpqpgA== X-Received: by 2002:a05:600c:1d9b:b0:471:a3b:56d with SMTP id 5b1f17b1804b1-4711792006bmr102464465e9.34.1760953750028; Mon, 20 Oct 2025 02:49:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , qemu-s390x@nongnu.org, Thomas Huth , Eduardo Habkost , Yanan Wang , Zhao Liu , Marcel Apfelbaum , Halil Pasic , Jason Herne , David Hildenbrand , Matthew Rosato , Richard Henderson , Christian Borntraeger Subject: [PATCH v2 1/3] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine Date: Mon, 20 Oct 2025 11:49:00 +0200 Message-ID: <20251020094903.72182-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020094903.72182-1-philmd@linaro.org> References: <20251020094903.72182-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760953811850158500 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 --- 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:53:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760953816; cv=none; d=zohomail.com; s=zohoarc; b=Z/Cgu1igLG129kICRMDutOzFLd7KLr5axb/AZiP6OCTP7bcH+aE3y0ZJxIfJKzUm2a6eK1lFIwSwVqnkyquc+jkaMxRRdrmBrPxcPIyU/e1VUvKovHK6QMGkjP9pVGwFX7r+coU5H2tR5nfNVmYX2gveCoU0OBKO80CBbL/Iocw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760953816; 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=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=JcWqTz+CQp/GzH/EkHOhyUtMzNxtLxtr97K1PdzcfqVdnM2KfLv4hq2BqG6Kl7Ln+E3luUF4vL5Wdn2BcusClp21XWbmjufgLHqPzMke7xSbtBjZh/QE1zXEPhQYE/WJRboO4Kf7W7vJPnMZ9nqLdlKDatDifUF2hiXQD2fCx0o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760953816881353.8466031922268; Mon, 20 Oct 2025 02:50:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAmW6-00078a-KD; Mon, 20 Oct 2025 05:49:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vAmW2-000772-RL for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:22 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAmVx-0001dr-T8 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:21 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so16812395e9.0 for ; Mon, 20 Oct 2025 02:49:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4711442d9e8sm224032105e9.7.2025.10.20.02.49.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 02:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760953755; x=1761558555; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=O5+7kYSoIYIIy3GeLlSoB28c23Gwmew6gQ2qUjSJ3DJD5xwdO35dftCoUasp7g/mXk 8iAGSd6VnbDPc0FPcJMd7C278ji6KyDAbrhAcsexlo2fKjKGydxky6RIWv5nlV469N6q QhDJpjP6A/tAnVS6CAKygiRgo0bR/Liz6LqupE1VYoiUuttFcTuDtLp4LBHgtVSr2iM2 x4KcpNKN1qTndsqA1V7HmoGXk6uzAnm0aRKrpMqCIR9/yBvYAY5W0mewmn/+v7cZCFbn 9tTKI89Zx8UobgPhO2fwmi9JEt13mupP0TqRmiKQKAvvFV3KN7YyXlJpSszrw7MOR9Rn Vmgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760953755; x=1761558555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=Wa13B1acR2lA9vPcBSKCnhCmwWZ+/eceHSTtPWnPXsQKMsJdA2AOaMtUb9mc92G2SB OQhhbBuBASR29d49yF1sTreZUYGGoR4EIrHjONRKrhXBq2Jdlii1iPg/rtKw0Cou+nnQ Z64Rg6rdHBF0DosEedOrulX8GceQ7IN3HLlTMoVI/t1tRCdysMPTUwWjuVnjMacyXQTt d7C2iTD/HY3iZiXew+leOuJ6XuNFf/EGkG3BTXWKeoJ8l5Kg9NgFKnWn7w7ocApMH0zW FDhRyBRn4RPdjFM3xeYWiUDjzRq0kNXEL03qdsBIqgkd/Sy+msHEpnBU6ZAgHy+M4UTb Zj8g== X-Gm-Message-State: AOJu0YxLU11Uqq6uGg92Jk0njFfiMebltoRnZk1F7LqcKBAaxzRA/vez p0aWR2Grgfs9Lsj0TI8/Trn1GoB5LS23pxnvYlS75QCqEwYOp/mWCvz0pbBzzt/DljNQCVanb6y l3YpfSv8= X-Gm-Gg: ASbGncsA4iQIqlvhmiI1D20YUISxvyrdzB+UYYEfhYiqCqqOlWfe+46YzUBhHh0FYVD CaSCh1UMxFtGi4TFOa6SLVnpgZxgv0CHTeA0uMSFhMjkIPAq5gV3d1+484ruIaPmMERJEHml9Yu 4npsANmUa/FJAJpeU5ypGLSUvCfU9Kftx7uRLJQNDv5Q1UN0nR2/uwDDWHYKT/3K7D9SJBo+Yv9 TOU6HLxVHvEj3qLBOaG2QnriVbqLYiVSdwzUFS7p3zzs6v/fpH5oFIMEVBh0c1j0YhII196h77v HuTLBras380dvFFhCPe8JE9JYxvs6YQj8jvJcPuk4dWt44j2Lzyi/WM/N6EADz5VcOKzkQ89JQ3 NvSjJibL2m5IdAAKHs3teYcdT3CqKkWAYG1P5NaMeX435DkYsHSsyxA0WTwfeMxdRt91iVdjLuo Gh+RHbXeWbnsvaYbWeZiN2MNjoAz7O3bmBFW7JfizkAtGpUfa0a853sipFYiCH X-Google-Smtp-Source: AGHT+IHoU0lwInV+nIsW9xOICxYr7yI10flL6e6ZG7UgHVipR9KOFyPoSEyIo0KdN+xxeCeMjSCNHg== X-Received: by 2002:a05:600c:310e:b0:471:786:94d3 with SMTP id 5b1f17b1804b1-4711791185emr91600415e9.22.1760953755238; Mon, 20 Oct 2025 02:49:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , qemu-s390x@nongnu.org, Thomas Huth , Eduardo Habkost , Yanan Wang , Zhao Liu , Marcel Apfelbaum , Halil Pasic , Jason Herne , David Hildenbrand , Matthew Rosato , Richard Henderson , Christian Borntraeger Subject: [PATCH v2 2/3] hw/s390x/ccw: Remove SCLPDevice::increment_size field Date: Mon, 20 Oct 2025 11:49:01 +0200 Message-ID: <20251020094903.72182-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020094903.72182-1-philmd@linaro.org> References: <20251020094903.72182-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760953819932158500 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 --- 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:53:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760953809; cv=none; d=zohomail.com; s=zohoarc; b=Sa+SjLwnLE0BFtQerfDpic/cGr3GdVy4IAnDKxQeO04R01FlaHbLlID/Ug6oztJtUbdx/boJ5OuhLxs0ei5Re51OsSgv7g7JRRImAoXKVmIcdqtm1P0jubuaF5mdKXTkqkmgvWgsmPncf0wTaswjPyLuRXuLh2xWDPr2djKwdpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760953809; 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=gCybBwF6V8sY1v6Bxh03dNHepbxx2PYShng4zrkVJvs=; b=oKlDPVlX7Y5JYKmmIYO7TJK8m1Z6Qz1v+tSSvCIIy5XJD2R7/0cZA3DNPq2aEbfgwCJfoLn7dH2QTTPw7pFqttZQHUqbMG3Lfy7XqLcGyakkhHFphzx0g8OltzC4uYkgoi/lZgmc/8JPM69ArnrXoWuV+IRCgC6DgnuySOXgFJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760953809229403.4034171161219; Mon, 20 Oct 2025 02:50:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAmW9-0007A4-En; Mon, 20 Oct 2025 05:49:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vAmW6-000790-CW for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:26 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAmW2-0001eM-K3 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 05:49:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-47117f92e32so25021745e9.1 for ; Mon, 20 Oct 2025 02:49:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-427f00ce3aesm14650950f8f.48.2025.10.20.02.49.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 02:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760953760; x=1761558560; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gCybBwF6V8sY1v6Bxh03dNHepbxx2PYShng4zrkVJvs=; b=EtcEuUTJ7kgXLnv6cn+9KRRZz/YSE+8zZgoh5kH7zyEDWc2rhpADD6Pg3pMYRv8FVX HbrjSbiD+DKKls+m+mFWc1chZSYPqMZzbkMUAyX+f4K+Yrx9u7QalhhO0AP55Y5OjdST QGmlBSf1isi4eoaYj7Spg/kyME+TG/F4CVtxQovkVfZXY2hZiPIspse3dwMrBlsWDYLg y89sN4K07gYxS4ScOpDSPPntoH0s9qrdBJWfWVQdySb9kDS/YHbrtBMuxCeXJo3sTjrt xWtn5jR/a7XUhNNPDRwbZm1iPiiaDPFd9mYeJu8ikiKc+PHq44r+ZB4wD+2RJHhSkRtR ZjzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760953760; x=1761558560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gCybBwF6V8sY1v6Bxh03dNHepbxx2PYShng4zrkVJvs=; b=qGWJ7pJWDo+B5+xrcq2xdJBRx/mJQnMjHBS+tmPg9B9x+I66E+30yMZti4c/96oCVt zF5Zew0YCnZWPHCkSXpJlZ0IJCzqlzbB/NdrEIRGlqDajJTJYONVN5qdoFa8v+bqldTF hn/wO3RteYYQ1S5fNIDlwWnHr99tfEB5WcWb22HyO+J+kj5SC9IS60VkJxw/eiLf4vxT pZdh2aKCYjPHsnY0B+p3Bq/W290ZaDklOocObyRWWDGDvarxE8tHcewRUCXuEhgl1Tb2 QYmeBxd9cUzIIY+okUpw6NBEOlX54qT732K79ia4AZ0L3A1x0mj2aYvzjKJHh36FWCMz x6nA== X-Gm-Message-State: AOJu0Yz4ncwmnq5t0H5YSXEw9XrM+n5+o4v3cOR0tPvlgJTcR+KCG+Y4 E8lzcyTb6b41Fr/lAPgvNNRjKaJ0E432vKpn2s/oTUk10yWZ4tlUOFBkwyx9H6Y1cYPq+X+/MfB PUwurLgk= X-Gm-Gg: ASbGncsrb4Kl7rR5B8+LfmaIYPHWpBqqYfM5N2e9qH8J7PG2gr+uO/GsqIFlu23MaHR WRH7ScNmDC1U+QjaOA+onCJ92TLtgL5zoeXNHA11m1ZHnk3Z+1ERX47YEdf6fYi8cQWLffObYFX nalfgx80P2RaBN862Js83wf8EixOt52vU/JsE8HppgUx6211MsID9aGN5G+lRwTLKwh78oP5L+6 XWLm4i2Uq2GtHvnJyxhtQwYxaf1XIJuF5p5BBp1gNTrYFk3bksgn7FYzf88DiA8LfKRFDO4rjtp a37+0te5Mqvcpo9LOvdzCZ7LHy4jwdD2MsoQDsMvkqnEAU6SjGL6mjsb+3Tr8Bfn+3r2O5RRcb/ ICizT6Bpiin3PQKaRhm/43/QBWrzNbt+TKMwCqMe47mawYO4OBUxNZaQXSO+ljbZVMq3HnrL2Fs 5cMUL4KeDcKZ8zVm46bgwzzBDXNkXNWKo2MvyGdJRVj27dmvIDhw== X-Google-Smtp-Source: AGHT+IEHmXNWtmKp5QRazYaA2cfTtkPfZw5w99KPEkQAtn0TsqccJptgUBHKv2uxNZwNf306A88feA== X-Received: by 2002:a05:600c:4e89:b0:45d:dc85:c009 with SMTP id 5b1f17b1804b1-471178a236cmr87010555e9.10.1760953760193; Mon, 20 Oct 2025 02:49:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , qemu-s390x@nongnu.org, Thomas Huth , Eduardo Habkost , Yanan Wang , Zhao Liu , Marcel Apfelbaum , Halil Pasic , Jason Herne , David Hildenbrand , Matthew Rosato , Richard Henderson , Christian Borntraeger Subject: [PATCH v2 3/3] hw/core/machine: Remove MachineClass::fixup_ram_size callback Date: Mon, 20 Oct 2025 11:49:02 +0200 Message-ID: <20251020094903.72182-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020094903.72182-1-philmd@linaro.org> References: <20251020094903.72182-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760953811858158500 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 --- 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