From nobody Tue Feb 10 11:55:51 2026 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=1767883036; cv=none; d=zohomail.com; s=zohoarc; b=irLvGK2TfpDIdVgBzj7huDSkfDC2kBvuxuyOmfuoBkz+30NGe9apPuBeCRpbOr7uWQbrauR0cSY0TtkcLH2RQtpvOxnyz2P+lAdpyhEY1DB13e1XvG6h7xmHt/zDJPBCzivrd+NPUC8EArwQFjACyW1ndcX1aHPy8k23iaa5Al8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767883036; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CJzuVbaZdIwgkAzM484kEZrNbs3ZhkcE6xTd5j2Mceg=; b=d03wohsQS2JH87hFAoGroK+Lklh7wiKbxUx0CGkpZLh2sIuM4efQJpLAY8LLDMR6lL5VLMJtLwOXu/ACRWc/gEweFE0Peph+pYMcLFcg5jyFOPgm7oG5oUrpBDCNnjxu+w1x8qZSgYBHkpweC92u5c13E+0AIFkPFk9JDc5J4Ok= 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 1767883036343875.1466319961064; Thu, 8 Jan 2026 06:37:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdr6A-0007CP-W2; Thu, 08 Jan 2026 09:34:51 -0500 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 1vdr5x-00072E-8b for qemu-devel@nongnu.org; Thu, 08 Jan 2026 09:34:38 -0500 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 1vdr5t-0000hm-Qs for qemu-devel@nongnu.org; Thu, 08 Jan 2026 09:34:37 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-47d3ffa6720so33702405e9.0 for ; Thu, 08 Jan 2026 06:34:31 -0800 (PST) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d8719e695sm37602105e9.17.2026.01.08.06.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 06:34:27 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6156D5F943; Thu, 08 Jan 2026 14:34:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767882870; x=1768487670; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CJzuVbaZdIwgkAzM484kEZrNbs3ZhkcE6xTd5j2Mceg=; b=HYygImr4GhSEdt1R/SIEM+pDUdO/MLWXiAIlyg60A2D7iOkfkyc+ASIL8LdRoUyDcX o0tlFgzlwHsAcuL+6svx36tTurp4oJbD5AwEwF1b4tnT3Ztmg26+4tylczwPC7/DZkWo g+wvu/DnzehhcreiVR+HKqquU9LSuThe1cbe9WmhDhmbM02/MjiMZB0BqlqHeHf4I1LN Bz8QVfTJ5uDtnB/dU78Z/2rRjqJR3FzIKZ5aJry44ap4HoabZiuX1pflO4X3ba8x29mh 2fmwqDYHlZrq9nhuxnwER9w4dPt5ABrQbU2BII4x8QRvE7yi7w8BH9OLbEokVvvoLq5+ O/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767882870; x=1768487670; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CJzuVbaZdIwgkAzM484kEZrNbs3ZhkcE6xTd5j2Mceg=; b=RsbbPRQVmWdKcPFr6WilXGcXf0oPwccDb/VoazdDCpUQBCMbboXaJpt1K8tYwgeSoA RFGxv4uZ+5FIQ9RLG6cIxNxIO8b7TgklraROg75EfNIcBhf7CxC4adiuGxHu0jAZB3xN WUTdvam9K6nmr4YCB/T7+NpbxqUhw8oy4mZCCxeY68jcAo8LrH6XcebsggzAFmVm2kKT TfxufNYL0rjwneRXuv4GacKfnMpvM+BkgqTGVxd0HpmzyCWadBChHeEy2o/g/GHPgwuI sVtvEUyiNsaGynAgKUowIltbaQ8R8CwwbAq9Xn7tpoDxBUS7eQyv7FWSQSLuoIbw4RCN q+Tw== X-Gm-Message-State: AOJu0YyLQeHTLDmUXh37qU5fRPc9bY0FkIlL87a+OG3WT5YX+TnGrL+/ s4drb2oL6GJGS7NY6BTh4hs4md5MdpIqlJLJ4lzhcaFaFHOu3ImZyT4r1rz69b0pTHI= X-Gm-Gg: AY/fxX6QYuO6wGfiu1Kc2EJY7QJmv8/ZNvlxCaZvhlWAwN5KaAVDCagPCo1h6giddGS VtDze67LYqOl9mzQ75of1ao5WqQw5O2m84i9RL1wydfgLkAGCkqwNkM9Tkt/k50eSKZXZRWxEVp NYTTSWRZNAVgOaEgJfVvXfcJDkoygeZIQInescgCpdN5H9DOjPVT/FFOMgtCwbzznDO36vn2SN+ ttCTt2KWdGKy5CUDICClwjfkdMH2VHrpH1J7loBsIkE5km3gaHBXk4wyRF2BXtDjZyCtkJkcNB1 qt4R5dhEqK2AwEl6fWXDKfDqdth1KGqfcfOuPBq4hKepyyBbKxAbURQm+2V9lLwbeSJ0lwqTwgR L48T3Jx9qD1bo4LL9XmCVyqzUIoj9hcwoKzaeNh6JcynDerZz/yuqAYUiAf6wMK45MRFfMjon2p PooPW5B6P33AOvP7Sl2G83eQ== X-Google-Smtp-Source: AGHT+IEszrccpcodAmK2Okm4qvXdSHUt71l38BB9KgWymhwhe6pMkgAQT1Emcr+HTay4HgOGZdg82w== X-Received: by 2002:a05:600c:4fc6:b0:477:5ad9:6df1 with SMTP id 5b1f17b1804b1-47d84b0aaa3mr69677235e9.3.1767882870170; Thu, 08 Jan 2026 06:34:30 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Bastian Koppelmann , Marcel Apfelbaum , Zhao Liu , Peter Maydell , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Yoshinori Sato , Yanan Wang , Aleksandar Rikalo , Thomas Huth , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH 06/12] hw/m68k: just use reset_pc for virt platform Date: Thu, 8 Jan 2026 14:34:17 +0000 Message-ID: <20260108143423.1378674-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260108143423.1378674-1-alex.bennee@linaro.org> References: <20260108143423.1378674-1-alex.bennee@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 (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=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1767883037157158500 We never actually set initial_stack so revert to the previous behaviour and stash pc in the common env->reset_pc holding place. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- hw/m68k/virt.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index e67900c727d..6af74b7ba1d 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -87,21 +87,14 @@ #define VIRT_VIRTIO_MMIO_BASE 0xff010000 /* MMIO: 0xff010000 - 0xff01f= fff */ #define VIRT_VIRTIO_IRQ_BASE PIC_IRQ(2, 1) /* PIC: 2, 3, 4, 5, IRQ: ALL = */ =20 -typedef struct { - M68kCPU *cpu; - hwaddr initial_pc; - hwaddr initial_stack; -} ResetInfo; - static void main_cpu_reset(void *opaque) { - ResetInfo *reset_info =3D opaque; - M68kCPU *cpu =3D reset_info->cpu; + M68kCPU *cpu =3D opaque; CPUState *cs =3D CPU(cpu); =20 cpu_reset(cs); - cpu->env.aregs[7] =3D reset_info->initial_stack; - cpu->env.pc =3D reset_info->initial_pc; + cpu->env.aregs[7] =3D ldl_phys(cs->as, 0); + cpu->env.pc =3D cpu->env.reset_pc; } =20 static void rerandomize_rng_seed(void *opaque) @@ -129,8 +122,8 @@ static void virt_init(MachineState *machine) SysBusDevice *sysbus; hwaddr io_base; int i; - ResetInfo *reset_info; uint8_t rng_seed[32]; + CPUM68KState *env; =20 if (ram_size > 3399672 * KiB) { /* @@ -142,13 +135,10 @@ static void virt_init(MachineState *machine) exit(1); } =20 - reset_info =3D g_new0(ResetInfo, 1); - /* init CPUs */ cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); - - reset_info->cpu =3D cpu; - qemu_register_reset(main_cpu_reset, reset_info); + qemu_register_reset(main_cpu_reset, cpu); + env =3D &cpu->env; =20 /* RAM */ memory_region_add_subregion(get_system_memory(), 0, machine->ram); @@ -235,7 +225,7 @@ static void virt_init(MachineState *machine) error_report("could not load kernel '%s'", kernel_filename); exit(1); } - reset_info->initial_pc =3D elf_entry; + env->reset_pc =3D elf_entry; parameters_base =3D (high + 1) & ~1; param_ptr =3D param_blob; =20 --=20 2.47.3