From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73C57C369CB for ; Wed, 23 Apr 2025 11:07:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7XwX-0004Rt-Ot; Wed, 23 Apr 2025 07:07:06 -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 1u7XwL-0004NJ-P6 for qemu-riscv@nongnu.org; Wed, 23 Apr 2025 07:06:53 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7XwJ-0000LA-7H for qemu-riscv@nongnu.org; Wed, 23 Apr 2025 07:06:53 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-225df540edcso8927485ad.0 for ; Wed, 23 Apr 2025 04:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745406409; x=1746011209; 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=jBwBwBvoQvjFeMA6D6SU8+WJZtp4ESASlnNymXsh7Fc=; b=T1Yr+hdu7xfD/8GbVhWlomF5CI3JxcV4+otLTXRl0lMLFHZGCjq6f9WGcCVSmxwaHP VMFUElG+WeRUGkoBPBZd2gMR/341M96UmeDe2WHfqSgTYwiIlTM0rGKTuQfMHAoq+rVF vrV3clNURZB1+jWQguJI/2sqe9BdK7QPFL4SauvcoFXzNeE3Rfk+18F3ZBQNfZ1eX31z MlYZL9B312x2fMuwYQK65xUyMxKpcvt6J/SFk6lmp0+R12GQxr7MkI1KGBE8pj9Mwrdw FGMO8E5tjMPzWw/fDkOcMSmnYWfqz7rbXpFe9qmyCMuWZwHknxRm6lOxdad+orOKPrfS LawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745406409; x=1746011209; 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=jBwBwBvoQvjFeMA6D6SU8+WJZtp4ESASlnNymXsh7Fc=; b=f4oVNq5Mqw9xsZZSWSypQLs28e7Z8vxE+evMcD98Za3sMMJW5XLAnP6iJfPcEHDvga 9O70rG/hNmSnZh5Bw51mccBwuYPntBaJzIgPzxAstderEOQXXvUcLKZzvl3AdQ5DBRPQ Vv446cGe0zQ/3SdUJmZ34HEF7P70kOvztnnxrNpD4GSn8SSBLNIxbHTgeTAs2e7a5FqI HEsVAHe8vrsPBpnIb94FU1gwpyl2A8n4jiZwiBy08Yh6hfmJ5JTS0QH8qK34mAplrLmI 9QSDLIkEkdUDqStycEFdxfJ/hw6rWJegABdFHxc67ntJPkUpppk3+UngYXcs/lPyiX6R vTPA== X-Gm-Message-State: AOJu0YznNv3tFCXst6FPdrOx3a/+7claGlAwfk9Y+r9TS+e/dI5Sp410 mt99N/6O5FJ95bWsl4GcNYw74hDo8VM5aOdpDhnqJHK1U/M94/Z9zHJ18t3sG2I= X-Gm-Gg: ASbGnct91V2prJiMGDzb2GrYsbRZoamd3yzIwWJGgsBWn4lDVDgRSv6UwEaH8sSbb6/ hD4Q9LcM5ChNoKthtBB6CSOFrwPc3ErAOjUmGw7F/WrVPmkK6DT8ptWHJyDzynzrUT95OfOBUxA MuuRkoAjV4ZRBWkjBb/3xb7tXBiJYWaZ/nJioZ4YsW9hoIcaGPM8N3pzoB3lZDpHd7eKB0Whprt KnvPWi2cTJ1un41COhl6qbQg0NR9mxzbrL+/YQpIFAM4TLldsHq5VOAKwwBK7tXbo3d/A+1KgkR qmmr55wkFcoQqQ/omVwoW8X/Ux+Kj06NoROclrrgcEHWBOu18Qx+1/L5gKzdbnU= X-Google-Smtp-Source: AGHT+IHiyz9XO2LcNoIncGAEEe3v/qQpte6TP+eRnmKO9QVO2qHkf6ZWsWF/inde0ZcsEp+l6RaeSQ== X-Received: by 2002:a17:902:ebc3:b0:21f:1348:10e6 with SMTP id d9443c01a7336-22da31bfb8dmr40237285ad.13.1745406408804; Wed, 23 Apr 2025 04:06:48 -0700 (PDT) Received: from localhost.localdomain ([2804:7f0:bcc0:89f4:3b90:a265:963d:8357]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf3b1sm101509895ad.248.2025.04.23.04.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 04:06:48 -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, Daniel Henrique Barboza Subject: [PATCH 3/9] hw/riscv/virt.c: use s->memmap in virt_machine_done() Date: Wed, 23 Apr 2025 08:06:24 -0300 Message-ID: <20250423110630.2249904-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423110630.2249904-1-dbarboza@ventanamicro.com> References: <20250423110630.2249904-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x632.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-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Signed-off-by: Daniel Henrique Barboza --- 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 fdf0318e15..473416bcf3 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1430,9 +1430,8 @@ static void virt_machine_done(Notifier *notifier, void *data) { RISCVVirtState *s = container_of(notifier, RISCVVirtState, machine_done); - const MemMapEntry *memmap = virt_memmap; MachineState *machine = MACHINE(s); - hwaddr start_addr = memmap[VIRT_DRAM].base; + hwaddr start_addr = s->memmap[VIRT_DRAM].base; target_ulong firmware_end_addr, kernel_start_addr; const char *firmware_name = riscv_default_firmware_name(&s->soc[0]); uint64_t fdt_load_addr; @@ -1476,14 +1475,14 @@ static void virt_machine_done(Notifier *notifier, void *data) * let's overwrite the address we jump to after reset to * the base of the flash. */ - start_addr = virt_memmap[VIRT_FLASH].base; + start_addr = s->memmap[VIRT_FLASH].base; } else { /* * Pflash was supplied but either KVM guest or bios is not none. * In this case, base of the flash would contain S-mode payload. */ riscv_setup_firmware_boot(machine); - kernel_entry = virt_memmap[VIRT_FLASH].base; + kernel_entry = s->memmap[VIRT_FLASH].base; } } @@ -1497,15 +1496,15 @@ static void virt_machine_done(Notifier *notifier, void *data) kernel_entry = boot_info.image_low_addr; } - fdt_load_addr = riscv_compute_fdt_addr(memmap[VIRT_DRAM].base, - memmap[VIRT_DRAM].size, + fdt_load_addr = 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); /* 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); /* -- 2.49.0