From nobody Fri Nov 14 18:17:42 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=1760383136; cv=none; d=zohomail.com; s=zohoarc; b=PiACs5adoQo76kEmYMi/9OAJm2R2Dem2lqeVukQhyJI5moUZepJS6PckdzPelkT/eh5SxuhbtLZcTydSHSELyPd85KpIUriTPd6y8dmB7DrA4ZwvV54XvEubHj64sNvq8jONdrjznno2qNNcr8jhMsobvReX5nfCZZTCV2u1sT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383136; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=TiskSlcpHbVz6etHzZa5UXIOcmLt3xPCpjHSlXUbr6c=; b=d79HjVvabJ2DGcARNUGWWQx5v3wHvg2uOuNavYmC6qKZHvB0FNAwSKDUHHUgNYPOFC0zZW0H7ckN5D5j/bEPNJUateFGfHOe27VVEI2y3X9U82IpOf6hwc9J6ude6pQcUseJYHvfhNCvu4OeRi9MotcF/ujQXEeHOHI0TAIkBXo= 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 1760383136466174.641552968037; Mon, 13 Oct 2025 12:18:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O43-0005pr-Rw; Mon, 13 Oct 2025 15:18:35 -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 1v8O3o-0005ec-Bf for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:25 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O3k-0001pX-9I for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:18 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-46e34052bb7so54615765e9.2 for ; Mon, 13 Oct 2025 12:18:15 -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-426ce589a21sm20209395f8f.23.2025.10.13.12.18.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383094; x=1760987894; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TiskSlcpHbVz6etHzZa5UXIOcmLt3xPCpjHSlXUbr6c=; b=YbfnCE022UyiZi5OD/osa4oPQC1CNRG5gigGpjwtIIxKbQOUZNMs5s5QCuK6H5C/bs TiMay4Rb9AueF0Fti4kF0RDN91562gJhDxfYPm/FuOjI9zhIZxxsp/SDs9MGAzIQHFnj ZdISbZv1hf36LtqGv5KmfuckmDFKzzDNBTKyfjtZz2Vi/uRx3HQVsSOHy9W2IeIlUC9I tTS7B6I6/GNTASB4G7cRAhFKyQAE+Qso/chojt+MROfxfxfZmw4fZ3goymQ8u4TVY73U cwOeDbd+w7IV1QUvSiyKEZzSGsS7joCHpDMcbcC5TLD6JH3EEpLwPa+4K7wkuTZdhHJc 2QNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383094; x=1760987894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TiskSlcpHbVz6etHzZa5UXIOcmLt3xPCpjHSlXUbr6c=; b=gqgJ9xXLpwB1L++c6crfpXo+WL2EOSSlsuN8TKqJAp1SzWmJlaymBkuacvansmpd6M WHMz/yflPodIkBZUZPAeX52jbbbD/bglOhAQjFjrb7xYKZ5yNwohshcDWzDGBBRJbNWB vY/i6aVG4ma0YsZbQmBT6DY86J6YKeAMLY/v8Dgp415Izh7QaEbLOI+nQWtqyuF22VFP lq9Ojj8/y927ZHLI0YKowwRmKNZyfD2ZjQw6bQXSy0nMXeQfO6FdUO/nmnZv53WoZEWs 5Aj5aMdcgxDQeP8jDoNklHUaekPE6jgWyZlpY4/C95Tu2CBv01A0EC8BiaE/Oj3Ixk1r zH+w== X-Gm-Message-State: AOJu0YzfKUzIow57vna84Vt/cvz6LIfkmf5y+ta30nsrEef8TukCsjP9 8QXObgAu62Bf8l0IOPpr4vQRR4otacyDdZyFcJbcz4mriQb+ztNkyP0ZPOeuPeXd3THCjueGkOo KV4A/3gM3/g== X-Gm-Gg: ASbGncvHPERsvx+jcyRhSzJQvkPCinV3ef82pAsn3XCo3ISYlEHLmUS29tQADOdE9md QLWnu0IbChyIc8t7nDnMNGIsQMVBXFjWn2/FJOqEBAun9CU7X1YI/ZAkWqbzcv/ZICvcqngS9uK gSAaVGeL2ZI8zlo3uxuE5CslsRDLuvHqi7f8zX0waokT/5XDIQsBNE9A/0z/8Meyp4/lmPwozsE rr+S4zJqwjsNfYYZJaJD2pgmeLeaecJNlF/KMb7HPkIE0VFNCkrInjFWXqjctaS7xorAfVyRp/s GH/t8p3gAI0P0ujyCQCuTekFSbV1hsRvOdQSawJwgCoQU1DS+MMrP/3ht351OepMRQUCpOCKx5r 8jiNXsFhE8zMBFrgAOflB2UAZaHKFZnD4SETUABXyCmSuMuWn2kv31bkAbi45FKtcAZUvkwGmHr ibfITXi9R3mab5CxeN87Gdy36IEpDWGw== X-Google-Smtp-Source: AGHT+IFDodQo9M24T2nSpwjl7e0HKNo2PXvheRtdse0f/NQ7gs8mrsx+GkEOPtpeUVpl06o6PBOrJA== X-Received: by 2002:a05:600c:1383:b0:46e:330a:1762 with SMTP id 5b1f17b1804b1-46fa9af1697mr156506475e9.22.1760383094157; Mon, 13 Oct 2025 12:18:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/12] hw/display/xenfb: Replace unreachable code by g_assert_not_reached() Date: Mon, 13 Oct 2025 21:17:56 +0200 Message-ID: <20251013191807.84550-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383138424158500 From: Markus Armbruster xenfb_mouse_event() has a switch statement whose controlling expression move->axis is an enum InputAxis. The enum values are INPUT_AXIS_X and INPUT_AXIS_Y, encoded as 0 and 1. The switch has a case for both axes. In addition, it has an unreachable default label. This convinces Coverity that move->axis can be greater than 1. It duly reports a buffer overrun when it is used to subscript an array with two elements. Replace the unreachable code by g_assert_not_reached(). Resolves: Coverity CID 1613906 Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250729111226.3627499-1-armbru@redhat.com> [PMD: s/abort/g_assert_not_reached/] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/xenfb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 22822fecea3..164fd0b2485 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -283,8 +283,7 @@ static void xenfb_mouse_event(DeviceState *dev, QemuCon= sole *src, scale =3D surface_height(surface) - 1; break; default: - scale =3D 0x8000; - break; + g_assert_not_reached(); } xenfb->axis[move->axis] =3D move->value * scale / 0x7fff; } --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383133; cv=none; d=zohomail.com; s=zohoarc; b=P3e13ambQz0KbDEZQx8j+YMpl1MbHARoWVc+99YuG5k4255jUKxaiid4KxAdynq74lIQxVM6mojUGA6Ru3cVxG9Wto2fB4hJvueUE/AaML6qVu5vEOVrF2HdqK+9oY27oQiQ4tB4pFWZvikhhYUY5sxV/w6yiA2xzhAbDukh6IU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383133; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=yFEI1kGhRN6aaxid2CLTaTbl1TgQpQbBIzoQ3rTUwW4=; b=gjtoIAj2DeQh8MHELv7sIrGKlc1PldzSHCuj6YjhLdsjTCMD6KVdyBPyJlzzzyzphgAW1vBE75+itWVi9aSaT37jndwaA10NHc6XKdTG81W4dGPu8uE0HTwm+y5/UA9d8nWfDqBmF2I8gQU/V35y+R6aV5KNGbfdYon2nvSJw+0= 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 1760383133026823.6531764969341; Mon, 13 Oct 2025 12:18:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O46-0005wu-09; Mon, 13 Oct 2025 15:18:38 -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 1v8O3s-0005gb-3Z for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:28 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O3o-0001pq-Kr for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:22 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46b303f755aso39713745e9.1 for ; Mon, 13 Oct 2025 12:18:20 -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-426e50ef821sm4964802f8f.38.2025.10.13.12.18.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383099; x=1760987899; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yFEI1kGhRN6aaxid2CLTaTbl1TgQpQbBIzoQ3rTUwW4=; b=kNd/J7vo8V6QCOQ2NZNHpHs6zMKEo+foVZm20oGiu6K91krpnlraqSBh08daeGtSI/ e9O6UrPUfNSFRei9QbbcdfF9A5nobb8dca5ROMZsGQB7OJZV0IjaHLhN1mEeXC4zbJ/j lNv14ztyXbfRHsVAOqNr9nK3Ks00SjuUaabC65ZK8CGU+l1xQgd1uSN5X1Cu3XVzi0Il 5bCtwjsDCyVLyjG5nt/owjx/zPTdKGMNkjVXtj8SX0H5gi1twH0n3Y4xoLzVsr6J1qym dtIbp9iQgXgDIbCvne8YRwKWzZRTiTBOVlrqZNg2wUWwQIwQBqIfb1bTlNcmiGuXlD3W YBiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383099; x=1760987899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yFEI1kGhRN6aaxid2CLTaTbl1TgQpQbBIzoQ3rTUwW4=; b=g5cLdNOLrwsKXIkcEIzbClncACXGVuQiIIQEGXm7XdUhpowYAMtHVKUiGbCdCgkDv0 YexQnUYMDjc6S80WH4Jf0Qk5ZOrfYxFwG4g9ECV5lr3/ISmb+d5HVV9ObTLiCtLhk5Co lkF6O1GgcXaSmGJgLUXP4+eRRO0R0XdciR7VsUF123RCWnOlOg0LK5njKOrmFBduD5SJ gEXWAVV4SU3Io5TwbeRR+bB3GxPHW4oaRvQz5u8vWhWyenD99w2l31gzur/03v6d3H6w abLtYMWDdOSiagb9UYiWf3s3tvZRTFxUAeRvmyfN/Rz87AVUDAt7lsDZf0U4+dPqLTu+ CxiQ== X-Gm-Message-State: AOJu0YyCoBZdijqav8SXN5pIQrgSLtrdCeVUWvwnwQrgngK90c0t6MOZ BfiI6skoxoiy62zHWKFXzjU6eqLzb07Mr/vmxpawW733oahgphDT8a/143NfHDYp2F3ue46GEGn EJ+SYOUIydg== X-Gm-Gg: ASbGnctf0runYyNKJy7DbWPHb3UiOGmPyRYdT/4Oc5swkHldKAKgEavsoiqDE+ZAI1y PB5qnPv2+iD/EmVqJYrhiDa1/BW8XKYmET1/MyML/xs4dQnH9TJw0lqFXlyXn/Akr6buKnfQt9P OyRp13xoEynN08KV+T6MBC0e18K/i+D0/hk03HJQKXsUEo66GzKuSd9Tl7e3fpKy4dmAfbRE/2w Y9p7n9q8FXRl+yXkAUAM7WVI7jAtk0Jqp+ckuvbXTS1ZauDh6DUHmfkUJlxznam8B3XCp6eoNfu SIq6O2iDUsC5BkH0a6F0DRy99raiiw9QWWWoHAfLBpDOTCIftUmk3Nfg6awlLQizCDVWEgwalqc eF12V49XpgniwdLMcGIzUTO3EzSGh1ubBEe8nnXWZxYXsqraFBxIC+ywg5JQnTsn4vPO5cIYvfP 5sK/NnxLeFw7KCQ02EUwI= X-Google-Smtp-Source: AGHT+IG4SpoIqMIxX+8zL8jnXkriNkz5+rO7968hRKfgCS7QmpcEhY9oduMIAvQdntCAz+dn8elxOA== X-Received: by 2002:a5d:64c5:0:b0:3d2:9cbf:5b73 with SMTP id ffacd0b85a97d-42666ab9929mr11268632f8f.6.1760383098653; Mon, 13 Oct 2025 12:18:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/12] hw/ppc: Do not open-code cpu_resume() in spin_kick() Date: Mon, 13 Oct 2025 21:17:57 +0200 Message-ID: <20251013191807.84550-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383134472158500 In order to make the code easier to follow / review, use the cpu_resume() helper instead of open-coding it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20250924173028.53658-2-philmd@linaro.org> --- hw/ppc/ppce500_spin.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 2310f62a91e..bc70e50e926 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -99,8 +99,7 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) =20 cs->halted =3D 0; cs->exception_index =3D -1; - cs->stopped =3D false; - qemu_cpu_kick(cs); + cpu_resume(cs); } =20 static void spin_write(void *opaque, hwaddr addr, uint64_t value, --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383149; cv=none; d=zohomail.com; s=zohoarc; b=k9K+t6W//bNs+O4OwvvYhASzJTyekrkc1Et+mW9ubkPVRZ6XHwe8LlLW3PBKtm1QpCJOdtpWPFiZ0WGc4IbJWaB29mTBDutXTbQjNvkpNxOmJ8mUAbuoy2MG7gSsxVMxZqYTitgfhWDHwQC9n8iWQH7GlI7T9XSt7AIY1qekAL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383149; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=X90IRoVtGXRK/n4lfBXEc9IWcosy5owAxi6CDzYBJNc=; b=PMYGDd7eBqApBGTpjicvCasCLUh2b2m8Y4OG8b82svGABqUr1Gfv1hbWgVgC0/NMJbtj5MbaakxsUTTJvoeBPxeK/zGN4QH6Z2GJ6j+P6lrQkmJBBNxH6UFuvdoBqZ7lEimjQuOg62KvyFv++b3iV9Ehq3XFqzOvXhSAbIj5PGo= 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 1760383149890286.3930899195924; Mon, 13 Oct 2025 12:19:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O48-00063z-95; Mon, 13 Oct 2025 15:18:40 -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 1v8O43-0005pB-9Y for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:35 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O3v-0001qB-Bg for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:35 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3ee15b5435bso2547552f8f.0 for ; Mon, 13 Oct 2025 12:18:24 -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-46fab3cc939sm137491935e9.1.2025.10.13.12.18.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383103; x=1760987903; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=X90IRoVtGXRK/n4lfBXEc9IWcosy5owAxi6CDzYBJNc=; b=GJlcRM1zkS5IKe2yf61WBz/elajCJLR+SjsDDWIegQRkGk+hbmT1y89Wfgfkh244+M fwc4nLEcYRwjZIjMTD7tSisU7tBy0jPBfYjZDaBWzva5SV49ewl8cphx9haL42qIFFHZ 51erApXd8ke+VtsxsNUnho8+FiSFVHuOA9wwMCP+kmyjjQZY/9VCHFRLpK61yPc9sOkI bcZHARjE/XySd3bbQ67HmXQR50coMeo5hQ27rps4jVLQFB7MWg2kOiRuBDcG00JjBg8B SkS/149MGJmHn7SlXtbxH2yLCBKa38nUs/7j+f5lpgA53FQwXGJWFaQBCFFotGdI2QS0 RiAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383103; x=1760987903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X90IRoVtGXRK/n4lfBXEc9IWcosy5owAxi6CDzYBJNc=; b=X6g26/b/D3+Eb+ZoZFQG6Sh05DPN6hE9+Kn/dHvB9uaWZ86KnV7dEs8th65zPd+o/7 XRPyGt4F+qViXWytfVKIwt2QhUGPijObEZXU/Fg+QvKAOkMq3KrlNLgi5Vu4K1FWoFh4 obbjXTE6LI3AdMG9Q121C03YL2eU1jXPRMTtqH73dUOw/9RXyGcOxiHcLUCfVKXzGSqr Qn43Tj5pUM0h7dhNizG/CAPAp2WyXOFG7XCkIgxSGHfJ8FdoWJRQJ1LlsssyXgqurJuM jIVWUSeJAhsQApkY0LRJyMcwNL2+BT18tbqsr29Ls91ePJg2C5pjH4dTqDQ3R3EBQZD5 dROA== X-Gm-Message-State: AOJu0YzyIKNDSHI5pMze9hTpgiP9MYhtrqBsOxp6hkL1d3PG9qecWwis wLLr5VHTnCbVowBem2CRs+4pJDMIRzUqNyB7QzlAcPWKYkzLGMyj7VU/zg6+t6lHn62RPe5WYQc e7rWhP5fqgg== X-Gm-Gg: ASbGncv09O7mD5jIV3PeY7Olj0sq3jyfApv4pPaSnpsJ3FdO3WrGHubXCT2FqAyF49+ jleK9eyAwBY6V06rscAN3CPKyrvXZvJGb3nVhi9JpHJuteudU19znHhkuLo+VwJ/K4KBLXCJSVG 3tiXlosox/fmbom6/lWZh/CXGirWoIhx6ZksUwYAlEW6Zvp/iiwZhM/N30d9vp5GEk+1DfXwy17 iVx/f/tB4hYxizFAXO6nq98d5NXQmmmUzmDQZmvkDp/eAu7OoLE2b+mBXLECp6sEnQGam7MGUxj +pUfW3SJpYOWpMcgvOW9Urq4Koppn621ZjgOsiT4Ewgu/WnPir6aO+OOt0Dg+Xw/Qfj8hm2ZivX +AOSRbqTonYM/iFIi+ECk5U6/NxVsQRJmyy/TgNG+wL/bm8PokoGs0gOV78COYtYfqFWPznoi2D /oHqqHGC6HKTOMkrG9BWsJHujTHj8TUQ== X-Google-Smtp-Source: AGHT+IHZcjh/CWpGI6wMKL4zqlhNy/vPU53B7E9T6yG27v9FeijaoBSGPQamkVJObmmye30BTo+kLA== X-Received: by 2002:a05:600c:6383:b0:46e:32dd:1b1a with SMTP id 5b1f17b1804b1-46fa9a8f146mr160813435e9.7.1760383103134; Mon, 13 Oct 2025 12:18:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/12] hw/xtensa/xtfpga: Have xtfpga_init() only initialize MMU Date: Mon, 13 Oct 2025 21:17:58 +0200 Message-ID: <20251013191807.84550-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383150406158500 cpu_reset() should not be used with an unrealized CPU. Here we simply want to initialize the MMU, not the CPU, so just call reset_mmu(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Max Filippov Message-Id: <20250925013513.67780-1-philmd@linaro.org> --- hw/xtensa/xtfpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 6efffae466b..55de1a7a073 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -268,7 +268,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, M= achineState *machine) /* Need MMU initialized prior to ELF loading, * so that ELF gets loaded into virtual addresses */ - cpu_reset(CPU(cpu)); + reset_mmu(cenv); } if (smp_cpus > 1) { extints =3D xtensa_mx_pic_get_extints(mx_pic); --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383145; cv=none; d=zohomail.com; s=zohoarc; b=X7GqArHB1RxXD0F8pBEtjBukPsdnQ/I+XEvbUroNQT18JlBPLWpDbHZkLtbZYpPLac8i0DZ1rrYSK1XfCvRA388TpAIEVXxMF8zUkY987BCcJ8cnd7Wy4IZaaBC/aOJktxVWKLkZr40lgLZ1vOwEYnTlLaMj1w/zIsPTTf+pVhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383145; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=u/vJ+qKrlctD4eDXUGD4jfZ1DrLRP2Xsc63+XfRRrpM=; b=YSHhBJO/ZfBTRgeUWTZrrZ2StrFzLaP35VwMkU+BGLkJRcbYYZ9dgF6LherXCnvqEZor1o6q25JeKpA/c2OtIw3ihYfEgo60ugF11ObJoY5/BcqPV05WQF90TgD+vnSjgCRS5CvYY+h+Foy6VOQbx+9U2OdNXZvvM4l1g0bivlc= 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 176038314531074.62526453222733; Mon, 13 Oct 2025 12:19:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O49-00069f-Mp; Mon, 13 Oct 2025 15:18:41 -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 1v8O41-0005oP-7b for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:35 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O3y-0001qQ-BP for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:32 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-426edfffc66so56034f8f.1 for ; Mon, 13 Oct 2025 12:18:29 -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-426ce5d0011sm19717298f8f.31.2025.10.13.12.18.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383107; x=1760987907; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=u/vJ+qKrlctD4eDXUGD4jfZ1DrLRP2Xsc63+XfRRrpM=; b=eq2wVrwMrxeKEvH01kyWloIPnbC0e/HvwWuRU4lgfh482p90m8LoMJ4d/k66Tt+qRp OumqSrm7vBIAJBPgFuHBEEOkrp51WLkw29J3ydNzpuO36/smji/KNMolLMRMNyWhQ5V6 fQuGOICUvEZ248CkBQkXIzx33DAqf+HlyzALwOw7R2ny+jXTr9y/2woD7wcrHsGdFRRa IePV18OVsLrX5uAtudk8ExwR2kNhqDb1788hu05TN4zOhC8LCDybsxF4ss25AKb2EFsi Td41BwTEwW1DrsfOWF7hdeKrKbZcl1UyjBQ4ZXqZ6PPckagdtkY3HgqjuzOep/Kjq3WX W0Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383107; x=1760987907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u/vJ+qKrlctD4eDXUGD4jfZ1DrLRP2Xsc63+XfRRrpM=; b=DmeDimQRCukU13Ifb78dot4LM7GEG5cLXEgqK/CDHxt9WKx5Cvx5vsaNOzDXMjwnyt kJNhmMegAQxq2jnQnrBTqvc/D9neNDX0Vl3uHi/xgHWuKiLDwNu8jwmZc/OtPJ6CxqGL a7YGhZj7DYH4f0slYF+fhrahwNAmoU5+0EuBYOl9CEeNjGvfkvWWwIVpLRSzVHlTd/AA hymfWw5uNxMurYB7aW84gkpqlNqha/ImwTQt153Oiw5lSxHy2XXdZulz0gRlqeZ2ta3T /sxXr8v3Mp9vtjGkuSzfjsSY5ItLYrvPm12wp2fJS+5hp284uy1d9nXXHCpAqF0Jfj4L oncw== X-Gm-Message-State: AOJu0Yy4GTK1dF7ka4FedmofiWKvlz1GrbWemZ7B/0pQX4my0xcekXDK NpKhzV2ARnLH8npcsQgYbMeeb2wJYbwWb0zEReX0DSUzfdXaMy+O7qy+Opd5elwm/9ii0BzNpI2 NfIlGCZ6j/w== X-Gm-Gg: ASbGncsB92RZ3KltT4MxA96zB3ccuItozcsJP0pp045GrI2Xqge+slM9CiU1402ULP0 f51D+s1JLBcIsy9ErjPxgwmQ/NTxWS4gNTfNToje5AlMRLb3XSRHZascdAOvVTqhXYxkr4GCenh aSt0q69Y+mQVqgP+gUj+NUEJPD588PLk6+1KtXsKhievXM/i9P8VKNJQaqnRXWyNpWtPuMbLfdO RsPGekuakq+OYolGLNPHctuvu1RnijOVUzs0EUa29mEIderBt/uegcSmhdf6ovPB92tDxknhPo/ CrFdC5EkbFMNYtLmGTDjMH4V4XdhU5p0qf86UMYyVL0/tuK+EziOJHrJuPMNYTF4OgtcdjCpbGp zzYoaiKRlfqx64xd/cLWivDZOnsNWZJUE80k/lb29D3ceVv567iD9hpFLkMMP3sfrg7LuTqM+Yi VfTe1CiPbKCBb1rw6Oqu4= X-Google-Smtp-Source: AGHT+IHcD4eQQP9ijHtBMzETLcOiJoRlEKDYCB+bkorLzomQo3cdCBx78cMJldYrLJzYQMMQdywQZw== X-Received: by 2002:a05:6000:3101:b0:3e9:b208:f2f1 with SMTP id ffacd0b85a97d-4266e7d025amr14684083f8f.29.1760383107593; Mon, 13 Oct 2025 12:18:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/12] hw/sparc/leon3: Remove unnecessary CPU() QOM cast Date: Mon, 13 Oct 2025 21:17:59 +0200 Message-ID: <20251013191807.84550-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383147981154100 env_cpu() already returns a CPUState type, no need to cast. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cl=C3=A9ment Chigot Message-Id: <20251002033623.26800-1-philmd@linaro.org> --- hw/sparc/leon3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 0aeaad3becc..09d2cec488c 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -192,7 +192,7 @@ static void leon3_cache_control_int(CPUSPARCState *env) =20 static void leon3_irq_ack(CPUSPARCState *env, int intno) { - CPUState *cpu =3D CPU(env_cpu(env)); + CPUState *cpu =3D env_cpu(env); grlib_irqmp_ack(env->irq_manager, cpu->cpu_index, intno); } =20 --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383138; cv=none; d=zohomail.com; s=zohoarc; b=cmpdLhyFHcTtFJ3yvaY27gP2qB05ox3y9WA4oS1mOObDTr5leAmCJP6o4aWsS+6pMuEJjI7g4r4cA1hMzXdytJ5fXhDPBRwZlxuFpM8FQEDrtqPovD/WNVBanhMma5cTfv+dvJWHMqby8b+6LINXzWNQ1HxUa8A8DwCY9MLZpbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383138; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=FFYu5WAdfoZfSrd8BJg28wx1m6J32jEZ9w7yIox75F4=; b=a4E4EywFcSaeem1Ghcd1P4tiwHzsYkVYIJC0eGIoLZ5vPV8fbESd2H0u3BG97ONZMU0BMBm2CQ8jfeJdpKX+MAlbXR42NnZ/SOuOggw65351CO4jYVU9LEl3cobg8GHCyi9lPyVHqJXlxrAOjU/rRZLA2tvAtiMgJOGb0tt/Q7s= 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 1760383137874516.8229761682893; Mon, 13 Oct 2025 12:18:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4F-0006KQ-72; Mon, 13 Oct 2025 15:18:48 -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 1v8O49-000698-Hr for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:41 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O42-0001qc-3R for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:41 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46e2826d5c6so27675525e9.1 for ; Mon, 13 Oct 2025 12:18:33 -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-426ce57d4bbsm19956108f8f.2.2025.10.13.12.18.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383112; x=1760987912; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FFYu5WAdfoZfSrd8BJg28wx1m6J32jEZ9w7yIox75F4=; b=OmjYSYl072hZ1Uyq8let5wgiNs6/GNfoofekBj9o+cI8w+lIKER7A825qCY5GmQsNW 0oy1lHI0Us+opIOIG6t+2/TPullripnMER+SWaYGCQ5GXAM+3R4p4RMSGyiZ+lkVcntn 5qTYbOCC9+jgcbIhk3r7huwZwNrQQNuMqQhqAmyKdIhJYWzcIRvoLk6G73IA88Mgnggs XGUI1IJAqrmelAOmaubx2aeuKB9PyJpbVDAW92ccIU/aQJlIWemAoP+jCi4JLY24dHfm kRuj0qWGOqsQ2j3zjxk4zo9bVap6Gm43bknen1sarr3vPF9YKvC1FlgMSaqGRiO4GXSB o6dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383112; x=1760987912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FFYu5WAdfoZfSrd8BJg28wx1m6J32jEZ9w7yIox75F4=; b=nOZgDpO9IQSswy8NFh0/OxkjBEL1/4EFySXNc6qu3Qkgd6pdqJQYBnsa3II0wbWhwa 8yz+zxMYOiu/ZL1CO2URZPGDKr8ZeJPuMkVdw9FopDT6ejaffDQ16+BlwSQFKsxfIfGt a/doIqm3Z9qwiqlbD7Nw/IPfNvPimwUZfwOdVdppjqimjzQKccsWriX8silnXp3zOMr1 KfGsgaTLdBB43FnTjjpjvCWWZ77OlnxWJYVZ28z4QRPfuUn48FzmC98ZSNcLd/VIKvMk 4TmQ6x6z2ik8jpAXgGzv3OxBjEe84WyljnpWzAUQvyK1gQXbuvfJBphKA0V9zGaqtS7Q XQJA== X-Gm-Message-State: AOJu0YxvMf4aehzxVc0XY+IfgKVQrMnFuY4WhCVKzW2c1g+TzbPu2GHj R2+UwHOLJT1uQ5eO2Wjs80xrxOWPwSmH8q63aR3XOLpisM5NPW0Uuc+lfOIylomd7cvh8O/QrT1 Q+78ah5FFKQ== X-Gm-Gg: ASbGnct1Zdv5NRyDxBqRci74NdDlTuGBd8hur2KFj21rQSxqhFWrTQ+Y4gknLxXYJf1 VD5HSj/T9V6kys3ytX0UmANwgt64QipSWAW+wdgKNuNG+oZIUE21jmb6MFQo5jLI7az61BMMeUK BrGBehGbphk5uJMw6BKObQZdgyXx/OoBdwJOt+AAqYz2aHJ9tP1Ma5rULUuuSX2jqBjkiRhw3Dq p2VuCwP0zH5tukv2cBsOSlmVqQgx06W23+1YZBDRUXA2Lrf4hELQrooD5prVjbk3yyHDebS4Ibd +b785ywfbVTJpZGijC8cx4CA5NO9TTJkihCFEwp0SXDHVIV2/NYkkWIvisELkVeUrSzupLmOFm6 4o32ww8jpOeUP6pbiqghS+pmkC9I0t7q4rTK4vXfjFuaJQx8S8DJlC6VkgYOoyv+Qc9ueMW3QcC Mp7Q0K8r5JMUPhkJQeVT/2LYeMj8kdIXDczJo1XPPA X-Google-Smtp-Source: AGHT+IGWkdnSVHJ677mWDy6vm3YInoZNlICjPUBp0Q5LPcR1uBI7swQDADG2nqO7WWsUm7hd0d/ZAA== X-Received: by 2002:a05:600c:8206:b0:46e:19f8:88d3 with SMTP id 5b1f17b1804b1-46fa9af313bmr150572735e9.22.1760383112051; Mon, 13 Oct 2025 12:18:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/12] hw/net/can/xlnx-versal-canfd: remove unused include directives Date: Mon, 13 Oct 2025 21:18:00 +0200 Message-ID: <20251013191807.84550-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, TVD_SPACE_RATIO=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 @linaro.org) X-ZM-MESSAGEID: 1760383139872154100 From: Luc Michel Drop unecessary include directives in xlnx-versal-canfd.c. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel Message-ID: <20251002073418.109375-6-luc.michel@amd.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/can/xlnx-versal-canfd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 3eb111949f8..343348660b5 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -35,12 +35,8 @@ #include "hw/irq.h" #include "hw/register.h" #include "qapi/error.h" -#include "qemu/bitops.h" #include "qemu/log.h" -#include "qemu/cutils.h" -#include "qemu/event_notifier.h" #include "hw/qdev-properties.h" -#include "qom/object_interfaces.h" #include "migration/vmstate.h" #include "hw/net/xlnx-versal-canfd.h" #include "trace.h" --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383149; cv=none; d=zohomail.com; s=zohoarc; b=Yf1yGQpdsYk1dpGF86FROg5CcUZcnqV4EDhK+ETZ7C9c6T75H0Q/C4JGJjyOwG+gUBD2swHxyCqrLsQGWSacK6NdhI6dHJxQ/fyFdQNqiHsUtff608+A+m0ZrGJQLQ3ZMmpJNMvTphNl3XlRCHOLsgZD85raTePQBtOHdlPXCZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383149; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Nq/c7G5HIzcDKU2UT+Bof9qbKyw2ITQMkRJlo4USl5w=; b=gQ/+MixmsL8ppYb8Bh8uFVKPDXAVMZa34Ar0GQFft/ez53+06LrrDoUKCeFsYwgego2hOyP6esE2Qks//XtA/YQOYhrtMV5Cw9SiLRD6vH68NUZ0U7Xw6wGT+IJYl3LD3dkiO7gtKrRfToFqsnXwlJjW1PmTtx5wzkxbgxSci0w= 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 1760383149827245.90144469051336; Mon, 13 Oct 2025 12:19:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4D-0006EY-53; Mon, 13 Oct 2025 15:18: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 1v8O49-00068x-Hl for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:41 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O47-0001rA-4t for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:41 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-421851bca51so2998910f8f.1 for ; Mon, 13 Oct 2025 12:18:38 -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-46fb49be017sm197361095e9.13.2025.10.13.12.18.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383117; x=1760987917; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Nq/c7G5HIzcDKU2UT+Bof9qbKyw2ITQMkRJlo4USl5w=; b=K2OJwcgqGtkYztEdJiiNp1ikgRGcLr5963S6y3RsLTHxRanx4QzEk0lVy0qMTscdug Fm30YD09ysDc5o5v7FlZVYk/JHCsuCY2SbrtBMUQH2PbVF9NlhhPRPWyQmI/IXIF45Iv 2UF1Zsu+PyCBVPTlbYyW1VEEKYcr2WPqH6uOqZEwlHLz7R5EXNdrAzPUTdFZQQvUelDQ Ta3hFlm8BmOwy3pGFVjg14PGLcY2GsgPWWeie75KPnqJCsH7I62uUqMZUQdVM7c4F3ZS A+CbPOqQeFDJCqPFBBdnBaycJlaHs5zEajq5xpfRaaT0MoOF8mz4/jPK0QtTsnYSmFCB CU7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383117; x=1760987917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nq/c7G5HIzcDKU2UT+Bof9qbKyw2ITQMkRJlo4USl5w=; b=Xw0ygcCOTBMQpG3d50JivDJQOvHYDDfzN8aOegxvhr3BQaUt+vyFbDz4AWZuCPvBD/ 0viyDB06Iqq91T/WrjV/Rn/2JFltElhTt7R4xVwpmaKvgB5YNQfEUkBo8WDVt7JFvdTc TlNK5xRhw7veqI3o4j0wwaqjR/6hoFtrpeFk943J9s2l0opcYhnPS/dk3wQcA3tmvpoD f3b52fYhaxUsjtHLrB1BXwkYsKWCdLBCTEI8TjIL1GoHiocsGeFaks2bZPbkVqQp+tyY iOGPOWYdQhDcoxR1c5qmlL7W+AJtVlzAusErSgJ15lnPFa7UbjrnRd2lp8fUoA/tFxgM 74tA== X-Gm-Message-State: AOJu0YweHosqvn8msEGkSl5c05lqJICTitscHU6qTOcst+IYBCEiJf1d l/1nB/7Q9qRDxOjdzRRlTYxs6lx+dvZeUjj2BUrgFlue0JH1MbYTFB8oLR7sqCOFlGcq/orXNCx dgH/Cy5RumQ== X-Gm-Gg: ASbGncuAzeeXKo69ASQ/cNUqMqrjJLCV6Cuzh7KbuxehbVI+2j3nl248qB2wyZqkAGe J8Z+V9jkbfnpjRnAOY84EHpMna4UMb3KwOL231F02mc/FcAxe46G47Fay4RGCtpLqwX08Xu2ypm B1N8aZKhJgV7suPV1N7vMWcyuIc405QkLoADCheDvTJaa1Aif3C6isNY2ZooIfXrlsOoC6R0MIw 8bepCBIBbwhuZr9wvlQsNBBG1lhJhx3nWQ87c5pQpkrtcjBv9a/OOTry4IIzWKt77c4VYnnl8sb 3aFh2wvRDOXDhidakjnGTVyoXVivJw2t3kp4YTC4JKbyyxdBTlid7x89yAoerkTjvtdEs85BZJf ti6DualjZQE9LOUVDOX/MXS2aSg++8PO9FaKoWg/8gc99zzkypQ2vTP+rvuB61mub3+a+FMQV3k uqfAQ8Y35GV5oaeGP8+pU= X-Google-Smtp-Source: AGHT+IEkRxSWhBPjU1LbjMsiqBXSTz2QHi5OOJpiE57vfS6uD2yJoS8YJ82efimZGlCrIarbJXeFFg== X-Received: by 2002:a05:6000:2509:b0:426:da6d:ca6e with SMTP id ffacd0b85a97d-426da6dcaa6mr5703176f8f.58.1760383116540; Mon, 13 Oct 2025 12:18:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/12] hw/arm/aspeed: Don't set 'auto_create_sdcard' Date: Mon, 13 Oct 2025 21:18:01 +0200 Message-ID: <20251013191807.84550-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383152546158500 From: C=C3=A9dric Le Goater The Aspeed machines inherited from a 'no_sdcard' attribute when first introduced in QEMU. This attribute was later renamed to 'auto_create_sdcard' by commit cdc8d7cadaac ("hw/boards: Rename no_sdcard -> auto_create_sdcard") and set to 'true'. This has the indesirable efect to automatically create SD cards at init time. Remove 'auto_create_sdcard' to avoid creating a SD card device. Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251003103024.1863551-1-clg@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 6046ec0bb2a..58cfbc71379 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1418,7 +1418,6 @@ static void aspeed_machine_palmetto_class_init(Object= Class *oc, amc->spi_model =3D "mx25l25635f"; amc->num_cs =3D 1; amc->i2c_init =3D palmetto_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 256 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1436,7 +1435,6 @@ static void aspeed_machine_quanta_q71l_class_init(Obj= ectClass *oc, amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 1; amc->i2c_init =3D quanta_q71l_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 128 * MiB; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1455,7 +1453,6 @@ static void aspeed_machine_supermicrox11_bmc_class_in= it(ObjectClass *oc, amc->num_cs =3D 1; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D palmetto_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 256 * MiB; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1474,7 +1471,6 @@ static void aspeed_machine_supermicro_x11spi_bmc_clas= s_init(ObjectClass *oc, amc->num_cs =3D 1; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D palmetto_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1492,7 +1488,6 @@ static void aspeed_machine_ast2500_evb_class_init(Obj= ectClass *oc, amc->spi_model =3D "mx25l25635f"; amc->num_cs =3D 1; amc->i2c_init =3D ast2500_evb_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1511,7 +1506,6 @@ static void aspeed_machine_yosemitev2_class_init(Obje= ctClass *oc, amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 2; amc->i2c_init =3D yosemitev2_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1529,7 +1523,6 @@ static void aspeed_machine_romulus_class_init(ObjectC= lass *oc, amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D romulus_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1548,7 +1541,6 @@ static void aspeed_machine_tiogapass_class_init(Objec= tClass *oc, amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 2; amc->i2c_init =3D tiogapass_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1566,7 +1558,6 @@ static void aspeed_machine_sonorapass_class_init(Obje= ctClass *oc, amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D sonorapass_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1584,7 +1575,6 @@ static void aspeed_machine_witherspoon_class_init(Obj= ectClass *oc, amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D witherspoon_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1606,7 +1596,6 @@ static void aspeed_machine_ast2600_evb_class_init(Obj= ectClass *oc, ASPEED_MAC3_ON; amc->sdhci_wp_inverted =3D true; amc->i2c_init =3D ast2600_evb_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); aspeed_machine_ast2600_class_emmc_init(oc); @@ -1625,7 +1614,6 @@ static void aspeed_machine_g220a_class_init(ObjectCla= ss *oc, const void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D g220a_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1024 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1644,7 +1632,6 @@ static void aspeed_machine_fp5280g2_class_init(Object= Class *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D fp5280g2_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 512 * MiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1663,7 +1650,6 @@ static void aspeed_machine_rainier_class_init(ObjectC= lass *oc, const void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D rainier_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); aspeed_machine_ast2600_class_emmc_init(oc); @@ -1686,7 +1672,6 @@ static void aspeed_machine_fuji_class_init(ObjectClas= s *oc, const void *data) amc->macs_mask =3D ASPEED_MAC3_ON; amc->i2c_init =3D fuji_bmc_i2c_init; amc->uart_default =3D ASPEED_DEV_UART1; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D FUJI_BMC_RAM_SIZE; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1708,7 +1693,6 @@ static void aspeed_machine_bletchley_class_init(Objec= tClass *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON; amc->i2c_init =3D bletchley_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D BLETCHLEY_BMC_RAM_SIZE; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1728,7 +1712,6 @@ static void aspeed_machine_catalina_class_init(Object= Class *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON; amc->i2c_init =3D catalina_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D CATALINA_BMC_RAM_SIZE; aspeed_machine_class_init_cpus_defaults(mc); aspeed_machine_ast2600_class_emmc_init(oc); @@ -1796,7 +1779,6 @@ static void aspeed_machine_fby35_class_init(ObjectCla= ss *oc, const void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC3_ON; amc->i2c_init =3D fby35_i2c_init; - mc->auto_create_sdcard =3D true; /* FIXME: Replace this macro with something more general */ mc->default_ram_size =3D FUJI_BMC_RAM_SIZE; aspeed_machine_class_init_cpus_defaults(mc); @@ -1909,7 +1891,6 @@ static void aspeed_machine_ast2700a0_evb_class_init(O= bjectClass *oc, amc->uart_default =3D ASPEED_DEV_UART12; amc->i2c_init =3D ast2700_evb_i2c_init; amc->vbootrom =3D true; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1932,7 +1913,6 @@ static void aspeed_machine_ast2700a1_evb_class_init(O= bjectClass *oc, amc->uart_default =3D ASPEED_DEV_UART12; amc->i2c_init =3D ast2700_evb_i2c_init; amc->vbootrom =3D true; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); } @@ -1953,7 +1933,6 @@ static void aspeed_machine_qcom_dc_scm_v1_class_init(= ObjectClass *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D qcom_dc_scm_bmc_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); }; @@ -1973,7 +1952,6 @@ static void aspeed_machine_qcom_firework_class_init(O= bjectClass *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D qcom_dc_scm_firework_i2c_init; - mc->auto_create_sdcard =3D true; mc->default_ram_size =3D 1 * GiB; aspeed_machine_class_init_cpus_defaults(mc); }; --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383152; cv=none; d=zohomail.com; s=zohoarc; b=FXIlMv++VmiSTAd+WL8VSkhSOz//HcikfyDZ9vaJj9TTP8K9AedoKyBaH1pPF194qzySOE22vVfsTLl0I3Bui7dfk38nmMWNW9rhmeR8SqFr22oKBWROe1nKVN9bvnhSek+u0ArrumhVvpTLqlI0ehgHed7XVtQTxEmJrPlA+Nw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383152; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ImXH8sypVIhpdMufqY4sc5FsVXIt9DpvDMKcR5HfhOE=; b=cxbyjL22e4VgS258ZABd6SR19cX4KwvHpST2HMehaxdIRDPx7TMuRAXKWSak+2OXQNFGT3K1XbKRoXcVxaf/4kxDYIvRGPrOq5HnGkwsYGT5dxbonMFxH1ZgDFheZLwDvcYs5AASNlSe1+pt7CznZZBiWR4r+uevCc8p36stDHM= 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 1760383152130795.7072888516625; Mon, 13 Oct 2025 12:19:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4J-0006SA-Jy; Mon, 13 Oct 2025 15:18: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 1v8O4D-0006Hb-NM for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:46 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O4B-0001s4-Si for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:45 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e3a50bc0fso34348105e9.3 for ; Mon, 13 Oct 2025 12:18:43 -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-46fb482b9absm228450055e9.2.2025.10.13.12.18.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383122; x=1760987922; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ImXH8sypVIhpdMufqY4sc5FsVXIt9DpvDMKcR5HfhOE=; b=qKFpw6iVGiJ3hBCB7ZfIKnTZCeY/w+3qs3Rqm1yARNcnacLtUpaGSajeTsodjxIOtM SDV5pyoghadLjJKoo9Zq/SrDcw4MJZKOFPF7ChNH5QBDoDzfwp6RBcQgmdACYYOGEXRo tdVjK+AzRR+yKOG66Y16WlBaFT/U/4mSk/6/avsIR5/t4HCL6iuwBPUHLqYBQj9dZxtD NHWJW7hXCUKLmkvZSVAZO36qas1qR6ExAzC3Qgoe7CZQCRv8HgXQoVK4btrOks4K4za3 nTDXaR/nZQxi1oQEc4LuT+4CrTbhoJOP7wPYg6Xoc3i730bm72kaQgxNNo13WS+If+Jk yDUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383122; x=1760987922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ImXH8sypVIhpdMufqY4sc5FsVXIt9DpvDMKcR5HfhOE=; b=KZX903SsDO8+FYBY/o0wPkjokgQJfENCNYVxYQJEGELh4ITSWNzrliJDXM1+iRTg4I QqNCBUkJyYSpXCcq1tcNUWClOcFl60eujhUhs/+eoh/yPSLyd4yNaMwDHtrvLfVroWmp /BKLsZ7EUjcW37kVhS4eOwKGAvP7ffC/7jydHT2/75U1Vc9RLUatkyEduAtA/jXOLLcZ d0TQvgZpP6wus8diSadTPrBf8pHmd5w9wyRYNoVNf7wBU7Xb66VFDISljIlVjobNwAH5 5BzTS0IWD0XIUcfRqJSAeHhl0Gtp+FfE4RVBrL26OjaofkwhEz4iOYGU/ccDxdz8YGrj ENjQ== X-Gm-Message-State: AOJu0YzzwCWMuqN8Yc8azPn6aroBI4MSHOGIeAmdnUgqvlhc+dE73TE0 PJa8QObsYlY5Bvws/JAMQcN9W9IPZCVy9530KWbu7WecwqkU6t/MbA8LQ/nT4U5jy8fRVdzHBnS G7vNEQlqzkA== X-Gm-Gg: ASbGncvOIpWrG9q69mEC16Qyy8dopjw/SRg7m4XWryvNeNAA+3FeOBbFA179z3Xcd+E ciwnIbXVdcbI3nqS+ym19JcK+4IAMzzTqijA9jCc2ya6WGgQx9C0uYUAV0NgGh8Id3lS6jVmMGf FGwboDU0H7virHYrBgpnzSwyQhfWlocwAFrtT3Bp0Y6jtZk6FvHlbDpGNYMnZGX7pp8N7KSPteL 4YQyDQ0DX5en9DI80XFsfqOa+yh/Z7CRbt72scVEIQC21jb4dbDK4GU+1/o9XFYQkY/mXMdFL7n jQbiUIUz5AVhFez+GnMqZGwH6Wx5ip5plZb7YVz/koBeVZeE+NTglwFgldjMWsfTtKoBeX9C0Y+ aSk+S7cZLynSDSGjdg1+fL5IWW4FVBsPUHNk1J4zJtF+hHlp+Utzr5aWPBYot7AE++4CYg4Tkjh aO4o5bIGl1oCizCl8yA+s= X-Google-Smtp-Source: AGHT+IF5Eb+XA79eXZvnjcvCFm4yRMft5BmVXTBJOWG2i4nOd1dhHE6GO1wIG7DG69IC1V5EWULtmA== X-Received: by 2002:a05:600d:18:b0:46f:b43a:aeed with SMTP id 5b1f17b1804b1-46fb43aaf3cmr78144095e9.40.1760383121761; Mon, 13 Oct 2025 12:18:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/12] hw/s390x/sclp: Do not ignore address_space_read/write() errors Date: Mon, 13 Oct 2025 21:18:02 +0200 Message-ID: <20251013191807.84550-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383154103154100 If address_space_read() fails, return PGM_ADDRESSING. In the unlikely case address_space_write() fails (we already checked the address is readable), return PGM_PROTECTION. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Jason J. Herne Message-Id: <20251007015802.24748-1-philmd@linaro.org> --- hw/s390x/sclp.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 51e88ba8f12..8602a566a49 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -306,6 +306,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint= 32_t code) g_autofree SCCB *work_sccb =3D NULL; AddressSpace *as =3D CPU(cpu)->as; const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + MemTxResult ret; =20 /* first some basic checks on program checks */ if (env->psw.mask & PSW_MASK_PSTATE) { @@ -320,7 +321,10 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uin= t32_t code) } =20 /* the header contains the actual length of the sccb */ - address_space_read(as, sccb, attrs, &header, sizeof(SCCBHeader)); + ret =3D address_space_read(as, sccb, attrs, &header, sizeof(SCCBHeader= )); + if (ret !=3D MEMTX_OK) { + return -PGM_ADDRESSING; + } =20 /* Valid sccb sizes */ if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) { @@ -333,7 +337,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uin= t32_t code) * the host has checked the values */ work_sccb =3D g_malloc0(be16_to_cpu(header.length)); - address_space_read(as, sccb, attrs, work_sccb, be16_to_cpu(header.leng= th)); + ret =3D address_space_read(as, sccb, attrs, + work_sccb, be16_to_cpu(header.length)); + if (ret !=3D MEMTX_OK) { + return -PGM_ADDRESSING; + } =20 if (!sclp_command_code_valid(code)) { work_sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INVALID_SCLP_CO= MMAND); @@ -347,7 +355,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uin= t32_t code) =20 sclp_c->execute(sclp, work_sccb, code); out_write: - address_space_write(as, sccb, attrs, work_sccb, be16_to_cpu(header.len= gth)); + ret =3D address_space_write(as, sccb, attrs, + work_sccb, be16_to_cpu(header.length)); + if (ret !=3D MEMTX_OK) { + return -PGM_PROTECTION; + } =20 sclp_c->service_interrupt(sclp, sccb); =20 --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383192; cv=none; d=zohomail.com; s=zohoarc; b=Eo113me7KNvzqS/1okQqpmxOVsLditIQvDs1boRj/o5DCmv/G8IvyMGW+TZ2SedG3XpPCMq2PGbKAzeHdicYg0EVMEggu4t9JsaLVw0QnX5A1UAg4WJdD+6IC0dAfJBU4N4/uMs6rAPlPsmvLMgMq4xbRYzkGwhE51apJgK3JPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383192; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=3o++8qrLq+EGatO3dUhXeLk7H80tOMbmVeX+vOl05oo=; b=NmPbRaSxIcJaeAG/h7yZWj2duvmGyETya55wXq450Qlbbh9JsvCt3J3jNiRbr8NItLzAM4e9l8zjT3/Qh81YkwOzfV9fjCw3PXcvim/qnJy08605tk9sbTKsuyVO8NHx6AG6FqPD2XvUBKMgv7pO1XH/6OpW++KyP5Ur9YYVe7E= 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 1760383192336873.5835583168366; Mon, 13 Oct 2025 12:19:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4N-0006bm-79; Mon, 13 Oct 2025 15:18: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 1v8O4I-0006PJ-KT for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:50 -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 1v8O4G-0001sI-SN for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:50 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46fc5e54cceso9499415e9.0 for ; Mon, 13 Oct 2025 12:18:48 -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-46fb489af92sm217038955e9.17.2025.10.13.12.18.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383126; x=1760987926; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3o++8qrLq+EGatO3dUhXeLk7H80tOMbmVeX+vOl05oo=; b=WKLCsr9K3TFTSlcIWmHLefD7HPQIHHji5jEfsPZulaGsd5NBgteO1d9zsyjGr1Kfz/ tRuLSNduc2tqanTfAAU1QWNtL8J8IqTt/MgALPs3Tjyc7JAAmDvfQsEOdcbRbrsReM+V bWX4FSWwZAvv97Z2duRa/twwTdQ/pIPTLrjpc55p9T8QuZgAa7TX0LoPglpwZ9/l2uvq QNu9/BfVG2aJHm7sTBvmYKgC2nMjbiYJEXHVF+SnF6e2sbsK0Q0jok7VainYPCaRd3mH x1aroO9JDxmwIeiX8c1wy8M2wQ/rLiGeenyyCRq6K6xSRqCkjSaEMnZ7PX3joaKuzS5v ykUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383126; x=1760987926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3o++8qrLq+EGatO3dUhXeLk7H80tOMbmVeX+vOl05oo=; b=YBx4t0vVNsH9BrYf2LXhwrvpJuUQCGRJ9LB3m97t/J0u+QyDJcvJ/GIXpa3cz6MjiL 3hVyeM7JFnVN0EHuk02Czt80PAPeTYxngg14g86puwiryRs1Zccm+a3xy4LfxNWyvu07 NNRKLTciIiAHj8GbHrm/gbNfCx1uzUvcx9B+DeIQg+gT4RnKkimcmYUz5lsSiRC1BEOC KObDKych49VRB2pTNeCViMK4AcK8Jp9XrzXbBpNHmXIYIjmWDYkvZ7BjyZkpviarZmRN GTlOLzhYfQcEiejIRIac8FooYNukkRPQpk54LuQm/C7bTRCDsOgoKZqoEUy0B+UKNkYU 75Dw== X-Gm-Message-State: AOJu0YyG5TJUCLQWxO7iXv2yXkjw8zQduHLc/2KMg1iVai/pYeYmmW71 gfDY3aj9EEcDH0d+BV5WjQ+hv1SSHlJ5OqvI44jERrHiPcNMA5usD28lzbQ+ZcTZgyAysr2ZF+k 3VO+UrZBTRA== X-Gm-Gg: ASbGnctcvuQ8BWPm1fJ9fZONUECVbRDcg+he5tU8II77lK2YVc/t2MVKPc5ml7JUVft QuPJwQ4B04XgoXBK8bKNdhSWrkzG5JlCLH3Fax++280qq9YuDVhKj7JIRyHGbuMkNJwaho64W9H MMPEA/H/zY5OeGiCf06RMVNB+7xNVqL4SPHSCV49WgwPn/El//apW/gvQlhvnhmBj2mr5pt8d9t a4wAWuKgBAg/eFWrfqiBjWAWLObrmx1VadLOetaIN13N6iSXWchXDHKFt4O8uvuFrR73gKgmB4H fC7Ph8JEP8gcIfLBFGAQHfNxiZ6npwF5TEIRBH1AZGdGEZw1nFKBZyybCSv9nDNZ4QQ1Vng6Duq TflQ4wlAsMZ9X3iUFirlLWOyB3q4CgXCAcM78dQh5uPESnaTcJFQvIbzYDI3vrL6PihFq5j4/19 BK3HNWVbjZDky+1KMzK/E= X-Google-Smtp-Source: AGHT+IHfHF0Jcz36fCW9b6a35aYlV3oJwQtwj3o8JiFqeflivF511cRU7ISs/p2/HQ33gcjY/pyM3w== X-Received: by 2002:a05:600d:41f3:b0:46e:6603:2a84 with SMTP id 5b1f17b1804b1-46fa9b08bd7mr168268785e9.32.1760383126277; Mon, 13 Oct 2025 12:18:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/12] hw/vmapple: include missing headers Date: Mon, 13 Oct 2025 21:18:03 +0200 Message-ID: <20251013191807.84550-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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=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 @linaro.org) X-ZM-MESSAGEID: 1760383192874158500 From: Mohamed Mediouni Disablement by default led to: ../hw/vmapple/vmapple.c:276:39: error: use of undeclared identifier 'GTIMER= _VIRT' 276 | qdev_connect_gpio_out(cpudev, GTIMER_VIRT, | ^ ../hw/vmapple/vmapple.c:479:54: error: use of undeclared identifier 'QEMU_P= SCI_CONDUIT_HVC' 479 | object_property_set_int(cpu, "psci-conduit", QEMU_PSCI_COND= UIT_HVC, | ^ ../hw/vmapple/vmapple.c:556:13: error: call to undeclared function 'arm_bui= ld_mp_affinity'; ISO C99 and later do not support implicit function declara= tions [-Wimplicit-function-declaration] 556 | arm_build_mp_affinity(n, GICV3_TARGETLIST_BITS); | ^ 3 errors generated. pretty quickly. Signed-off-by: Mohamed Mediouni Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20251007203153.30136-2-mohamed@unpredictable.fr> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/vmapple/vmapple.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 16e6110b68f..1e4365f32c9 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -51,6 +51,8 @@ #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" +#include "target/arm/gtimer.h" +#include "target/arm/cpu.h" =20 struct VMAppleMachineState { MachineState parent; --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383157; cv=none; d=zohomail.com; s=zohoarc; b=Pts2hEFRV/LDAwvofjYRvV5//blLfLzM3m5jcdOCgFlaLJ/92Y9lS9DrNV8Ji6aMVFb9koyVWaE7dFnpnl0p70NPrYctaRBhwfteFLcnPI3R4CFlAt/nA/ShKvyXrLLSvZSc8jNv7HdB15rPW98jhvNs/tWui2+Tmknq5QCtLBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383157; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ezt+z2zqy28XBUfCShfQnBxAW4qjR8fLU+BoSrNZSxI=; b=Oos8VP6qcSqHRBF7lyFJIpHhgxDoH+1qaopii8ThaWHED7HYedrxCOG0UWJeafKtV88pKaHIgmcOD4igowGEFZ8oCTkfrPtwzBXu6+5yHgmND1/Kn91i4W7Raf+W/+1Tk3OvOEGRvd9rmJZO3Fn3nNeCUWXfM3JZGrjIeSRVnNY= 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 1760383157436621.7892016097327; Mon, 13 Oct 2025 12:19:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4R-0006qG-9k; Mon, 13 Oct 2025 15:18: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 1v8O4P-0006l3-Q1 for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:58 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O4M-0001sp-T9 for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:18:57 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e2e363118so39131735e9.0 for ; Mon, 13 Oct 2025 12:18:53 -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-46fab633cdasm133419805e9.9.2025.10.13.12.18.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383131; x=1760987931; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ezt+z2zqy28XBUfCShfQnBxAW4qjR8fLU+BoSrNZSxI=; b=WX99JstGgjuox25nwf4Buie0902h/jJ+HdDNJ+ul3QAOkNbQGZaoIu/HXUVC7ewKlg 5NC2gWZ9zynSoHrG54MCs7WUSeodcNcn71CRySlv25WwwrXv3AaSG2EnIt1yn1kiQ0MH oqCpCi4jPhPAkvVBezbIWMFcxwchIWD7PfmlWdG68kPLP2/vidvB7hCgb6qLzDx0By3H 3yFT1cFn4y/QD9bXb2T0+g/sDQS/NWcm0VpzRzLwajMXppup2bslsG9rhibaNN2DyDOE LVvqQDmZwtWJV5SXIp0Jy3z+oRujVYdvdCJjJhQTIJmjcrm/FlO6DVdm9zGIDU4O04x5 IzVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383131; x=1760987931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ezt+z2zqy28XBUfCShfQnBxAW4qjR8fLU+BoSrNZSxI=; b=ekmZmRzvuDvWmd0sX7nBDC9v/VifVrLcEjfiYjVb+izY2K/BJYxyGgoZCCgEgWCJ1W 8Ip9trT6oHMWcMHik+fKA5SOYZqWBSdGm6HtBldqq9mSqMdP0Mio4Od+MB5wDKkvesav 8MTAq6lSpW6rc6vNYM/6Aj25LzmZTfEjVnm40lsj16GU22hQHdupiqTTZZmM97X+lTy4 aRytJZWNFDApnevmnwopwAwRmTMIs1CApwCzl2IGxNTnrn38HQCgXhMFVHfqVjkHUMHm TZ5Lqy9rjG31ilN9Nj03H8PrqYSwRAqOKdFih6ezvBy1btsfT3vhc9AZVBd+p7tnuTZS NKsw== X-Gm-Message-State: AOJu0Yx2d1ujxHsbYB6dcpY8/YOHjRlEkTsGGSWW2iAr7vywba1Rthgi FiBak7a7gZnvemKfNiNI5p2jkrPKAzm6dDACBUpPG5Uut5583ARNYtCZ8W0C7g/bJ8g+p+Aj2UI nTeIzDXFwog== X-Gm-Gg: ASbGncuXvieTtMLvGLyK44ZJmmjwXU7OuVIw7ti0XW7d9/hPCjBIPd3EOGQOu8teevz LstBi/iBuVTl3StpZ7Fx75el0LYZQwt7wr01kQXxUVqW3XeqMm6/OQe2qAIFOBbYVf4Vcb7TSM4 gnQkjKifWhEOqQsVuvahj//PQpFDB4oHZ6JFnKsSL7dfjnJwSznKokH29EzqyhcO+1Yc5RxOs82 Mirj+5Q6aXwFvfliu6Z0CuZQfnGzGye/cyj+ZYB+Y5xcINzcUTFtXghN/gPPO7UUCT0HBfP3Qeq I89j2RgDDFI90Vup6ZM5bPdjMPutUCYuwJm0pgVVPy0WFfgj/q7XDHcVW+3sLiBwzN7Xkmw3CVZ jB9sRuNmuKhAt6ENj8jSC3U3+fwZcd20MLYi+vPJAb4h7JUilug0q+JzOGCGk/cpfexfnr1ce18 zHoOviU6xfj/In87DYRNMlb4Wtyxntwg== X-Google-Smtp-Source: AGHT+IGt3D3aRphYd2Zw92sEQIv24gJhiXDWK4kDBC2x2zTnGqbiEQ1WzJvKSIwNzg4uiQ6zsYIoeQ== X-Received: by 2002:a05:600d:416a:b0:46e:3f75:da49 with SMTP id 5b1f17b1804b1-46fa9b11794mr156207145e9.37.1760383131482; Mon, 13 Oct 2025 12:18:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/12] hw/loongarch/boot: Remove unnecessary cast to target_ulong Date: Mon, 13 Oct 2025 21:18:04 +0200 Message-ID: <20251013191807.84550-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383162564158500 Reduce initrd_size scope. It is already of signed type (ssize_t), no need to cast to unsigned for the comparison. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20251009201947.34643-2-philmd@linaro.org> --- hw/loongarch/boot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c index a516415822d..3dd48cb8aab 100644 --- a/hw/loongarch/boot.c +++ b/hw/loongarch/boot.c @@ -306,7 +306,7 @@ static ram_addr_t alloc_initrd_memory(struct loongarch_= boot_info *info, static int64_t load_kernel_info(struct loongarch_boot_info *info) { uint64_t kernel_entry, kernel_low, kernel_high, initrd_offset =3D 0; - ssize_t kernel_size, initrd_size; + ssize_t kernel_size; =20 kernel_size =3D load_elf(info->kernel_filename, NULL, cpu_loongarch_virt_to_phys, NULL, @@ -328,7 +328,8 @@ static int64_t load_kernel_info(struct loongarch_boot_i= nfo *info) } =20 if (info->initrd_filename) { - initrd_size =3D get_image_size(info->initrd_filename); + ssize_t initrd_size =3D get_image_size(info->initrd_filename); + if (initrd_size > 0) { initrd_offset =3D ROUND_UP(kernel_high + 4 * kernel_size, 64 *= KiB); initrd_offset =3D alloc_initrd_memory(info, initrd_offset, @@ -337,7 +338,7 @@ static int64_t load_kernel_info(struct loongarch_boot_i= nfo *info) initrd_offset, initrd_size); } =20 - if (initrd_size =3D=3D (target_ulong)-1) { + if (initrd_size =3D=3D -1) { error_report("could not load initial ram disk '%s'", info->initrd_filename); exit(1); --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383198; cv=none; d=zohomail.com; s=zohoarc; b=YxfR9lx15fLBnYlyeT99X+sDAN/ZHVzBfPf2MioglkkTzMqcmAhpYp9p79YU0CZXNKw8/1li9dKgDoXYntVVJefMtvfcZggoE2FXAK7C/p2A2JWhgIP7ILUgOZvUmceNhfhTHxQX6qxwsRTtRoKbLEcpMa5JkvI9evkHB+ESwfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383198; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=CB1VK/yjYxp4/URxQ/T4/YFokgwgN5AuNNyA+7xghsY=; b=aE2mDBoG4PxyDh+CWWDPRHluYE1Yzo75z+fPXIjfKjPvfEe/w1YJj62Z7xwpDce8ABrmKh+mdJjaxnMl0dCVrnfBuwCwmC3+vkVhbQ7W16Cdb9ZBEO8pGNeWgepcmXgfhfsU+aKS5TAo9U70ENxddQi2O6ARKKBjeMpc5w70Ntw= 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 1760383198895479.7462590056592; Mon, 13 Oct 2025 12:19:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4U-00075L-B2; Mon, 13 Oct 2025 15:19: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 1v8O4S-0006xF-MF for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:00 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O4Q-0001t9-ND for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:00 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-42421b1514fso2281270f8f.2 for ; Mon, 13 Oct 2025 12:18:58 -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-426ce5833dcsm19579127f8f.19.2025.10.13.12.18.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:18:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383136; x=1760987936; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CB1VK/yjYxp4/URxQ/T4/YFokgwgN5AuNNyA+7xghsY=; b=SwcptS4q6/A/LRiXBBC3bxPzg8J3+9dhBk80nOKREk0DBQWR7D4NO3IjDp0xSAqzLj IEw2/9sevVi/Spsaxeu7X8EDSZwHZySnnYXVVjf/DHtimfrXJ90RlRn3dvYLLmf3XhGw TOc2E9IiBi7KmgldcZIOdGQ7j/1vTWRE5u5RiDu7kwRMgBD+9S6u/G7l3cL+3Yl4hPo+ ypf74sehHbCwNUcdRBvexWkNVsvJVNTgMbT41/BKEmBrr8kQp7S4R3vFhKlQmGLShuUe Vzy6hXLjpyCscfeJYYEakxqzeMhQpP5mF02yX3nIzLxGlqr4wskn6SPHcY48h3ZPa+o7 izXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383136; x=1760987936; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CB1VK/yjYxp4/URxQ/T4/YFokgwgN5AuNNyA+7xghsY=; b=kfWGf39q4bM/g+DUDkumugwA4T2iLOITjnx6RyWXr085me8EAAarrkylJVdhmqc5vt Gc+5yzJnNyp0/YBM8ulbIY5aHRxZCPtnZtaK6pLTyhIwCgq+eMfmus+jmoVcNcJqBwYG P2rzhcHi8oymjHVmqQrGQt/sYsnJgvw1m5cpHW+ffOIuneg3BXDCbD9u3hVO9EA3N8Ft CoLCBEFFc4sGW+gXJJOVJMGqoIBfTEP76U9QN2JqIyPIwNh+wUfxNeKYP2KbpTZFlquq ls6MmzHo9KRaS/+JBLhEHPBxYkUoBVPpwAiP5uY4KS8QD/t+UFz66csEhN0tPTT1CqcX xfIQ== X-Gm-Message-State: AOJu0Yx9PZ5Fc8HXcdLODIf0gaRJV50C1hJCOUMC72lKU5FytYWHi3YG BqyLGp11dG5qA0y63J0PD3pNVYXmdJngNpKI6ujuCKecVJmJPcVSE3WEthRiIff6xWsywEAQl6R 36wpBU2gORA== X-Gm-Gg: ASbGncubvM2mivwrkluL0OSJpy4PVBXaihvQIspLl5ZZtcPlhpNqW4VbP6BCZacGiEy M3efz5uZu+YO38HkFWQE6qRxCAXReGIINuAPjvQKAuXkiQwd9zOQmXB++EmNAvl+LwlVBEkTfZf /vQWSbJfUSNlDcGx4U+PibM3E3UeW8mSl9QVWYFJqpTRkgUPqj1ywMO+pbiikJhcjluH5j8KcsQ cIwZvpEcsRsJoWvVp2e7Y8ScJavhz6TdLbCBNDVww5/o49LaIAGU60OVnlMTGzCJbAqdF4i6GbN 2ie93my17fZS9AATqNn0Qk13o8EnI2oRt8HDDKfALmfKYAtrCZJLYyx64VFrzQa9+08u9kVmPXp PPzt2ZMTuox88v/8Cn1AXJclYBG+gs3KpzBum0Oma64YDAnOkQexEIKvWvXBlC02ayKEYiyTTGV DhyPbFsPSupuzm1uyDr0Y= X-Google-Smtp-Source: AGHT+IEZ/inCgUIVwBHqWsvqvOAAgAj78jhcsdU8s7M8LaGWyvxttBitBVrHVlfX2bWU77Rdoj2lgg== X-Received: by 2002:a05:6000:24c5:b0:426:ee08:8eb4 with SMTP id ffacd0b85a97d-426ee0893bemr181012f8f.44.1760383135974; Mon, 13 Oct 2025 12:18:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/12] hw/hppa: Convert type_init() -> DEFINE_TYPES() Date: Mon, 13 Oct 2025 21:18:05 +0200 Message-ID: <20251013191807.84550-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383200560154100 Prefer DEFINE_TYPES() macro over type_init() to register multiple QOM types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20251009143106.22724-3-philmd@linaro.org> --- hw/hppa/machine.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index dacedc5409c..2ab5fcb471a 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -709,16 +709,6 @@ static void HP_B160L_machine_init_class_init(ObjectCla= ss *oc, const void *data) nc->nmi_monitor_handler =3D hppa_nmi; } =20 -static const TypeInfo HP_B160L_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("B160L"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_B160L_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } - }, -}; - static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { @@ -745,20 +735,24 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) nc->nmi_monitor_handler =3D hppa_nmi; } =20 -static const TypeInfo HP_C3700_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("C3700"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_C3700_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } +static const TypeInfo hppa_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("B160L"), + .parent =3D TYPE_MACHINE, + .class_init =3D HP_B160L_machine_init_class_init, + .interfaces =3D (const InterfaceInfo[]) { + { TYPE_NMI }, + { } + }, + }, { + .name =3D MACHINE_TYPE_NAME("C3700"), + .parent =3D TYPE_MACHINE, + .class_init =3D HP_C3700_machine_init_class_init, + .interfaces =3D (const InterfaceInfo[]) { + { TYPE_NMI }, + { } + }, }, }; =20 -static void hppa_machine_init_register_types(void) -{ - type_register_static(&HP_B160L_machine_init_typeinfo); - type_register_static(&HP_C3700_machine_init_typeinfo); -} - -type_init(hppa_machine_init_register_types) +DEFINE_TYPES(hppa_machine_types) --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383184; cv=none; d=zohomail.com; s=zohoarc; b=Sqdihh4A0aUbZySzD3T5Mc4lnBOcwvUcaIyjrFxFeoGYqxh1wAJbeb4gSS+H3v8/XxbVi/Dth0eKdnYP1YSI2JWfikxgCw+mTs/DAxk7K0r12bO9X464VaJhkmFtHBIJTGqZdz0CX0r7Zp/eKWVAJoD2V0fvI7pb1s5yyJxqXuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383184; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Z3OmPpMLr5a1yvZb58CoYa8yVy1NYMyFvJnwaus/3Ok=; b=BwY04cdcaoLdwucGHH3MRwJpPn8D7ORcFB6KIPIq5nRNVmKGTGtN9T2Nzu9R3Ph3Yc62tQVozbgfoMyRgufnkbFCcppa+OofoI5bLXJXBrjSIot7t0WaZZwckNwpaU0cNRVTZQwzKaVWaAUfnR6nTbgzjqvf0khSAGDZtutfQTg= 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 176038318435650.21694122403983; Mon, 13 Oct 2025 12:19:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4Z-0007Wu-6K; Mon, 13 Oct 2025 15:19: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 1v8O4X-0007K6-7d for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:05 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8O4U-0001uJ-Pi for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:04 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3ee12332f3dso2784166f8f.2 for ; Mon, 13 Oct 2025 12:19:02 -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-426ce583424sm19444347f8f.21.2025.10.13.12.18.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:19:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383140; x=1760987940; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Z3OmPpMLr5a1yvZb58CoYa8yVy1NYMyFvJnwaus/3Ok=; b=kYB2UAa9Ab13jkeGKUF/Shwsb5kDZ3NVxPndqdLQeClnLLBkHmOdCx6jrAG/iffAp6 KdCiB3goD4tDRu/zsfZtOliPuZlV+km4qeEQeyGj5eKevpU4LX7g/b+el3fq7rGAuE/r UZe9+F1NzRNVpqrMT7puHwZlLd0CcU5xXZsyLKIAEojBvkKm5c3caSKJMObmTe9asD6h ti62QcX1B+UGdnNefHkCdJG1c/cMENvknOfSf46GyrnZBLsWEXZChAXoc1WTbVZdB6kl Gekm30zWGZiQZEChDSsUhg8JuMf5+idBpUBoiDtrRC+WAybpDfNXZZeNPC9MM4m0kVtp Mjfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383140; x=1760987940; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z3OmPpMLr5a1yvZb58CoYa8yVy1NYMyFvJnwaus/3Ok=; b=T5Ms+08jEfNcKgtinsalzJ854mMlrNyJFlMX+xfAPcUb+wpnU/EH4B1DPtHnDXCd8y lvalBS6d9Ao8eqHsiASpjvw3CfdM2NL1MZukdIZguERu5BVKJ7cpK7BygIunFu5YOGVL 8Q1WW7HOrlYVM0TC5o2N7NznOgldVUHj33pmA6BhVbuVy7ljtfTefDW9IYrl1SetgxHN SCq19nBqC3juU92LOVxsuJFMNnjWS6LAOnFI539UDasP6UGQAGL2OyvTvWYwQqmYZvKl ShG9A7hbK93i5H17yUWOqrMz6AkrvXfh/9W4x2doOTMEL2uieZaivZdya5zd3QIbnfJ+ eJyQ== X-Gm-Message-State: AOJu0Yzq4QKVScnADvwHR2ZV5BBY7c46BdjEactlmmUkWjYB4XwApVy8 x3dHS1e5IPagCq1LuQExlKrY06qAptYwtmB4FiaGQ9HlxMCtbCBmMSnNYx8VLW6AlKao035G+cZ QQhd8cnxu4A== X-Gm-Gg: ASbGncsRZymElWDqZ+YDswyCgCg99pKuKv5IaQoS+vdzHBhVcSqCMOOkbOapGWamC+e YLqB6mSSos9TE5d5PV43S2OzAlHTcoS4YQ2f7SE/MuG0tGgN/flW485ej4fSbhDg5eMCrAqM2c/ l+M+7H0b0i5BQj2/I7uiz4deXg9C5ag6dZcvTO0HZBLlDAVt3TYKx0atTS0CdEKTl+UJBWj3BUo sw1gOkGgSjv+ngJM4JYY76efCFSWvkXzjNABelNDcT3nqczCf4R/MamsxRP5IfG31GpBE/GXbDp vQfR5qq4D2YtdQl4noqqyZfbH8pwMcgIaZ8bIezSSQWkh8+QyWRqBnh6ZDTLe8+o+2g3+xWqGpZ OY4jhX367hHxSKFXAIvqqjXSoGQye6bwIaLfxj/+yJ33I06t/APY2EwXeh0KcjkfikWubPSDeDM YYvfRcw8lNJtQVo/5DnfU= X-Google-Smtp-Source: AGHT+IHAxGuD9lYVfM5Ei4GyR/TO2HxvXtPOe/VG9qVDgyQm5Wd4eLiE+VUH3kwBdHnm/GOZVstxFA== X-Received: by 2002:a05:6000:230e:b0:3ea:5f76:3f7a with SMTP id ffacd0b85a97d-4266e7d6b9bmr14846273f8f.22.1760383140477; Mon, 13 Oct 2025 12:19:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/12] hw/hppa: Factor QOM HPPA_COMMON_MACHINE out Date: Mon, 13 Oct 2025 21:18:06 +0200 Message-ID: <20251013191807.84550-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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=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 @linaro.org) X-ZM-MESSAGEID: 1760383186400154100 B160L and C3700 share a lot of common code. Factor it out as an abstract HPPA_COMMON_MACHINE QOM parent. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20251009143106.22724-4-philmd@linaro.org> --- hw/hppa/machine.c | 61 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 2ab5fcb471a..c8da159a114 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -36,6 +36,13 @@ #include "net/net.h" #include "qemu/log.h" =20 +#define TYPE_HPPA_COMMON_MACHINE MACHINE_TYPE_NAME("hppa-common") +OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON_MACHINE) + +struct HppaMachineState { + MachineState parent_obj; +}; + #define MIN_SEABIOS_HPPA_VERSION 12 /* require at least this fw version */ =20 #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) @@ -683,6 +690,22 @@ static void hppa_nmi(NMIState *n, int cpu_index, Error= **errp) } } =20 +static void hppa_machine_common_class_init(ObjectClass *oc, const void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + NMIClass *nc =3D NMI_CLASS(oc); + + mc->reset =3D hppa_machine_reset; + mc->block_default_type =3D IF_SCSI; + mc->default_cpus =3D 1; + mc->max_cpus =3D HPPA_MAX_CPUS; + mc->default_boot_order =3D "cd"; + mc->default_ram_id =3D "ram"; + mc->default_nic =3D "tulip"; + + nc->nmi_monitor_handler =3D hppa_nmi; +} + static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { @@ -690,23 +713,13 @@ static void HP_B160L_machine_init_class_init(ObjectCl= ass *oc, const void *data) NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); - NMIClass *nc =3D NMI_CLASS(oc); =20 mc->desc =3D "HP B160L workstation"; mc->default_cpu_type =3D TYPE_HPPA_CPU; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_B160L_init; - mc->reset =3D hppa_machine_reset; - mc->block_default_type =3D IF_SCSI; - mc->max_cpus =3D HPPA_MAX_CPUS; - mc->default_cpus =3D 1; mc->is_default =3D true; mc->default_ram_size =3D 512 * MiB; - mc->default_boot_order =3D "cd"; - mc->default_ram_id =3D "ram"; - mc->default_nic =3D "tulip"; - - nc->nmi_monitor_handler =3D hppa_nmi; } =20 static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) @@ -716,42 +729,34 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); - NMIClass *nc =3D NMI_CLASS(oc); =20 mc->desc =3D "HP C3700 workstation"; mc->default_cpu_type =3D TYPE_HPPA64_CPU; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_C3700_init; - mc->reset =3D hppa_machine_reset; - mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D HPPA_MAX_CPUS; - mc->default_cpus =3D 1; - mc->is_default =3D false; mc->default_ram_size =3D 1024 * MiB; - mc->default_boot_order =3D "cd"; - mc->default_ram_id =3D "ram"; - mc->default_nic =3D "tulip"; - - nc->nmi_monitor_handler =3D hppa_nmi; } =20 static const TypeInfo hppa_machine_types[] =3D { { - .name =3D MACHINE_TYPE_NAME("B160L"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_B160L_machine_init_class_init, + .name =3D TYPE_HPPA_COMMON_MACHINE, + .parent =3D TYPE_MACHINE, + .instance_size =3D sizeof(HppaMachineState), + .class_init =3D hppa_machine_common_class_init, + .abstract =3D true, .interfaces =3D (const InterfaceInfo[]) { { TYPE_NMI }, { } }, + }, { + .name =3D MACHINE_TYPE_NAME("B160L"), + .parent =3D TYPE_HPPA_COMMON_MACHINE, + .class_init =3D HP_B160L_machine_init_class_init, }, { .name =3D MACHINE_TYPE_NAME("C3700"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_HPPA_COMMON_MACHINE, .class_init =3D HP_C3700_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } - }, }, }; =20 --=20 2.51.0 From nobody Fri Nov 14 18:17:42 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=1760383166; cv=none; d=zohomail.com; s=zohoarc; b=RZ3lNzyEJaoD4Jfl39N9/ZC7MJ1TEi8P3ZCWTp78lJw/D6tjOs9xQ7zTYG4AzpuJ5P5WQcMoBou10l8iffimLsUuJ7N7BW6jJqsZ/bw7GxrAh5rDLTXtMqUqNvkASvHQDVzywfwe0eripRGhjN1bRwS5dkeVbduy8glPvcu3SAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760383166; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=WnbAZzepaRMWzlpCUMsot+yvnYOzsKGcRhhXaoGje1U=; b=Dfogs9xus3cjisWYru0qwvrdUiNWV0/5Yjty1I+/w3jbj7WPOqSSslHdkuP0sOXBFxXDDU1VgLF8DmN7xJzA4mw/oMaogS/LFxUA5xguvNVTNSUB3T9k+51RarTawfT1xzGrThD9G3c5pnMqsGtTNbgugLGQhMZ7wgVMc3PilUQ= 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 1760383166587760.5006694159042; Mon, 13 Oct 2025 12:19:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8O4d-0007p4-RB; Mon, 13 Oct 2025 15:19:11 -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 1v8O4b-0007ji-Re for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:10 -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 1v8O4Z-0001uo-UD for qemu-devel@nongnu.org; Mon, 13 Oct 2025 15:19:09 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e29d65728so27455415e9.3 for ; Mon, 13 Oct 2025 12:19:07 -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-426ec3ab5f7sm965892f8f.43.2025.10.13.12.19.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 12:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760383145; x=1760987945; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=WnbAZzepaRMWzlpCUMsot+yvnYOzsKGcRhhXaoGje1U=; b=WtxW+CNzAGe0/iUCCkiHS7QdfQAdFo1qHOceWeQTrlkEEcHXjGOLQ44HZfzAJKWAzV RvnEjDka+gWQcpoXU5zCLbSzCJzO9TxQESWvr/jR1EHw0U1bcsckube45VzW03X3w3xD NRInEtKl5XiAR8pYGh8JBF98osesAQEqFnkB8LbtlOOBCRF4ji0iCU+UMf2BXqzRyPFn jyIGB4CWCUKXpEIMaO4kc+ZrVCx/8BpAH7wZ8klMvfRUbu1c5G0JY6YtQ8wQY5xj/mzr 7a9LjC0Q8MVZeYrHMr+Z0GzZ2boqsVohelDUb3Mh+6KIEBFTPea/BnLlyZb9biSJEnRa 5WhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760383145; x=1760987945; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WnbAZzepaRMWzlpCUMsot+yvnYOzsKGcRhhXaoGje1U=; b=rlm85/TYPE7tdLsTxo8gcaVVgE7To4367NeCKB8wKRKplFAQy2a09VSfuXXXSp6HUG DAersifkiN81eV4QsUktrO0i43mOyiy2WuRQDDiUXcLgXQzKTg9JDLRHwYRZdM0ouCAu mFbdqWEEO1i7Q8qaU6MbnZ9hMtoGOjzjzyyWPClPla4V9aAuXfzYS1Flr4ynQyZ7KoTq y7mXs8MRhafa7PV5fT6k+P36HEqzaCuKIpIi4YcdPWc1wllUtacVxYdx0bmJQKWkKJjT gLGRSxXM0/C3lRP5RyaEqzyqWBkQAz/j+GOXAJOJB9td/eLnFo0PPsnaC7/Q8Kaa2nhm VT6Q== X-Gm-Message-State: AOJu0Yw4Dk0h1VOKLLKGF5dGEut11i5ymAT5JwlkuVHa0G1HjiGsQhIC TB30kYfpI2CysvEInlX9U5OZZgTRnA/wBCkzOwUyz+oAaw9tekdUrY8+sGMcz0ISJE/NDHiPyEk 2/X8aNuS7DQ== X-Gm-Gg: ASbGncvTu3TfsiwgSD8lDTta/XoQbH5yVK9pNZdGVoBuAy3GCFZbHqoRQTStKS+naYg Unj652nw9vF1vZ/f2+FNhPFWspLcx4+ZcjtTkcbd7anQBGSyOGyuJj0Nyh4YlUgXquc7FSA1xSx g51dBKfhM1OfkQsztdC0C9yRn25ustZjbldXE2wCAjcL6+20/XHZOVcqBaTdz87fUWdTse+zw7N irze0372P03ig0ZmctdTI00Qm4e78B+sQ/U/WBItmt4A4+/IofugLC9QrHO2ZCreL+G5A9J8mzY sUA4g6qreeAyWNIJWNCy3potRdTCW6fXz0pIZtAMKy3BhMrwM2Ha/WMMrHmwoRzIWM/Ig0fziP3 3IYLBmmHIhSOE3+TDFpBBctKF12VyWLg2tDD1XBbuEF2bcnr3Ln9lwiU8nrXBb8lShruGwPnWge Ezk/uxx+ihFYEdZeudesqnNHGYzcWtFw== X-Google-Smtp-Source: AGHT+IERRofb8xri21ebdCSHVjcN77IIddjz/PPJPaRghO/Pqld/+xwhHvwZs3hYsDSHfFgl1dvHOQ== X-Received: by 2002:a05:600c:4e0c:b0:46e:4c67:ff17 with SMTP id 5b1f17b1804b1-46fa9a98d8cmr135269265e9.14.1760383145007; Mon, 13 Oct 2025 12:19:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/12] hw/hppa: Reduce variables scope in common_init() Date: Mon, 13 Oct 2025 21:18:07 +0200 Message-ID: <20251013191807.84550-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013191807.84550-1-philmd@linaro.org> References: <20251013191807.84550-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=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 @linaro.org) X-ZM-MESSAGEID: 1760383170749158500 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20251010061836.45739-4-philmd@linaro.org> --- hw/hppa/machine.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index c8da159a114..cddca69b938 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -352,16 +352,11 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, TranslateFn *translate) { const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; - const char *initrd_filename =3D machine->initrd_filename; - const char *firmware =3D machine->firmware; MachineClass *mc =3D MACHINE_GET_CLASS(machine); DeviceState *dev; PCIDevice *pci_dev; - char *firmware_filename; - uint64_t firmware_low, firmware_high; long size; - uint64_t kernel_entry =3D 0, kernel_low, kernel_high; + uint64_t kernel_entry =3D 0; MemoryRegion *addr_space =3D get_system_memory(); MemoryRegion *rom_region; SysBusDevice *s; @@ -431,6 +426,10 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, firmware on 64-bit machines by default if not specified on command line. */ if (!qtest_enabled()) { + const char *firmware =3D machine->firmware; + uint64_t firmware_low, firmware_high; + char *firmware_filename; + if (!firmware) { firmware =3D lasi_dev ? "hppa-firmware.img" : "hppa-firmware64= .img"; } @@ -467,6 +466,10 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, =20 /* Load kernel */ if (kernel_filename) { + const char *kernel_cmdline =3D machine->kernel_cmdline; + const char *initrd_filename =3D machine->initrd_filename; + uint64_t kernel_low, kernel_high; + size =3D load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys, NULL, &kernel_entry, &kernel_low, &kernel_high, NU= LL, ELFDATA2MSB, EM_PARISC, 0, 0); --=20 2.51.0