From nobody Sat Nov 15 23:41:34 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 ARC-Seal: i=1; a=rsa-sha256; t=1745931609; cv=none; d=zohomail.com; s=zohoarc; b=M42c64fkLkXpLL1vS993/SCRXy6RiOKqYD+DjRSDT0XzgjrEkI0AQJxUpLk0+waTDApefuPo0rh7jwYTs/KyqHwdX4YuQYrxb4ptNPGykKOhed6+w5YaOc0ZUbHa+6HZajcb7RIKWpECpt8YjFn6yeqdFEGL30I0teWZb6ab8Ys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745931609; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PSkyU0vjXhUwUWhgnzvXaN8LDQB1wxCHD/83om66W50=; b=Vd+Yu+R07EmfCqA4FcRMJSm35A2C2bC3d2tZHQGhof05bwwLXQ4RMZXWyavzwdj7br2EGZHaJDWFvM7AfbTbQPwiBOQ0d1aOerW5oAvK1jJCTmJNzAwGbFJEnLIlm2A1DpR8miKB6kvxv6cR3ewojRgxn/FZG/ETIwWNGEf38vg= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745931609046527.7607031243647; Tue, 29 Apr 2025 06:00:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9kXf-0002R0-S6; Tue, 29 Apr 2025 08:58:31 -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 1u9kXe-0002Ql-4v for qemu-devel@nongnu.org; Tue, 29 Apr 2025 08:58:30 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9kXc-00009F-Br for qemu-devel@nongnu.org; Tue, 29 Apr 2025 08:58:29 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-223f4c06e9fso51646725ad.1 for ; Tue, 29 Apr 2025 05:58:27 -0700 (PDT) Received: from grind.. ([152.234.125.33]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15f7fb7e54sm8889440a12.30.2025.04.29.05.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 05:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745931506; x=1746536306; 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=PSkyU0vjXhUwUWhgnzvXaN8LDQB1wxCHD/83om66W50=; b=YeZgB7WzXQ1Qtku2cs5HU7EKH14794/GTd72mnv0qQgMi4cmoYvO8CGgUC4WA9Z+AI 146fnhIf8NIf+D36zFAp63zG6i7hJzUJOTrQqGY5uPRX1ijLGHXriibjwdi6ecuEKt4M Wc0SAaXVGqKgXt8+629pveoooqhyUcYmyDhNaDR0NeG68lkAb5RgUL9A9Y3jK50MzrB7 ng8SYnvf0CxS3jyKghHnD4Jcy2ckc7/Mldq6szBJWiPDzoVbOKp79s37L8WaLMSi9hrv 3sqYD24F3LpySdNncRJstZmzrVMrMQP0AD7UJ1M2mVYOUBNWBrUhn/y4D89dfDrOE2u1 m4Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745931506; x=1746536306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PSkyU0vjXhUwUWhgnzvXaN8LDQB1wxCHD/83om66W50=; b=IZ9HmIBohr0prKz1TZVMVI8Hl2+tsJsw2RLQJ7gjp+vj8smMwsSHPg086JKRg7e8dq 26C6QlHqplwJxhGNsl3B/mFlLnGTytxGOrrmQ8EcDexLmNgOcl/mU/6jn4EccbRqXhZM PxrcCPuH2b1LyyjzuJV5MJFh4WaRv1i/5Esjmz++m99rFCjkXyNgP4CpHSqz/K7JlDWP hoIfQBjqZBmZXUJA8KKFKjbsQV4orO/v1gOR5qNg18aE60mBD7y1Z3buEl2CBrGK7hS5 UmX0m35b127FLwNBKLrEuqC7GyIyMvid9cxz6hrNMCOaYixlmlQfb3eAZJ6kx99bv9hL xiyw== X-Gm-Message-State: AOJu0YyltB8nLERgLisYueDufkQPZ4egs6cFbcLBMdSBw478R65sDq17 D3t/XLonW/IAslmRv80Ba90RD3dOdfgiYTBSLKOfYOEJ6UqR3/rQ8DP5vQwjSORv+Mk7nrqV2fQ 1 X-Gm-Gg: ASbGnctke2eEai20rqtFKLPtxiLp/uDLyqigeqdTaLF5Fcm8YQv1xUMBjMu1eL6kJMK f3QYdZ+1ku0yT6fTcq/4uE7RaH23r6j6m+ioV7s3XJaLWa+1lRC24D6teiCis2CbufxnlDEJps7 1mzWIUKIcelmGUO+GSCgyrtAVvQvG4b4RuOpUpjrTOVrtuOwQ1ieGPjkgSWJmk0ovPVK9Xj0WYh XxYqz0XISFIkdoAv5EaX+BR53QAkiU5ktE48JofmZVoPaBTL59076DCwj0Gqpb28Hvtnm1nesG1 cBalUJ/GOZqas0hDAhaIDiJF6HznKufKgDsiXhxMAJM6RMMXuPKq7Q== X-Google-Smtp-Source: AGHT+IHzid89zuI6wBWF0plcnLCzduocD6bCTt6soORnX5isKTB/Z9IEW9L0MMA4I2/l6LYt5Hag8Q== X-Received: by 2002:a17:902:c40f:b0:22d:c846:3e32 with SMTP id d9443c01a7336-22de6c72accmr40315045ad.25.1745931506521; Tue, 29 Apr 2025 05:58:26 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, joel@jms.id.au, Daniel Henrique Barboza Subject: [PATCH v2 3/9] hw/riscv/virt.c: use s->memmap in virt_machine_done() Date: Tue, 29 Apr 2025 09:58:05 -0300 Message-ID: <20250429125811.224803-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429125811.224803-1-dbarboza@ventanamicro.com> References: <20250429125811.224803-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 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=2607:f8b0:4864:20::62d; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62d.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 @ventanamicro.com) X-ZM-MESSAGEID: 1745931611348019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- hw/riscv/virt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b4a6916abb..f324777161 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1429,9 +1429,8 @@ static void virt_machine_done(Notifier *notifier, voi= d *data) { RISCVVirtState *s =3D container_of(notifier, RISCVVirtState, machine_done); - const MemMapEntry *memmap =3D virt_memmap; MachineState *machine =3D MACHINE(s); - hwaddr start_addr =3D memmap[VIRT_DRAM].base; + hwaddr start_addr =3D s->memmap[VIRT_DRAM].base; target_ulong firmware_end_addr, kernel_start_addr; const char *firmware_name =3D riscv_default_firmware_name(&s->soc[0]); uint64_t fdt_load_addr; @@ -1475,14 +1474,14 @@ static void virt_machine_done(Notifier *notifier, v= oid *data) * let's overwrite the address we jump to after reset to * the base of the flash. */ - start_addr =3D virt_memmap[VIRT_FLASH].base; + start_addr =3D s->memmap[VIRT_FLASH].base; } else { /* * Pflash was supplied but either KVM guest or bios is not non= e. * In this case, base of the flash would contain S-mode payloa= d. */ riscv_setup_firmware_boot(machine); - kernel_entry =3D virt_memmap[VIRT_FLASH].base; + kernel_entry =3D s->memmap[VIRT_FLASH].base; } } =20 @@ -1496,15 +1495,15 @@ static void virt_machine_done(Notifier *notifier, v= oid *data) kernel_entry =3D boot_info.image_low_addr; } =20 - fdt_load_addr =3D riscv_compute_fdt_addr(memmap[VIRT_DRAM].base, - memmap[VIRT_DRAM].size, + fdt_load_addr =3D riscv_compute_fdt_addr(s->memmap[VIRT_DRAM].base, + s->memmap[VIRT_DRAM].size, machine, &boot_info); riscv_load_fdt(fdt_load_addr, machine->fdt); =20 /* load the reset vector */ riscv_setup_rom_reset_vec(machine, &s->soc[0], start_addr, - virt_memmap[VIRT_MROM].base, - virt_memmap[VIRT_MROM].size, kernel_entry, + s->memmap[VIRT_MROM].base, + s->memmap[VIRT_MROM].size, kernel_entry, fdt_load_addr); =20 /* --=20 2.49.0