From nobody Sun Oct 19 03:36:31 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747628285; cv=none; d=zohomail.com; s=zohoarc; b=cTSAIK5iHD1YelcmwppUF9d+H7THS8lSoaFv2tHxtmb1RC84AUq0xXskZG6MDFQjs/9Af9OGqdc+DgVzdJ3k9AAw4a29AOtTuW8L799jvL9Jv7DqeIZHZyYDOy8AV3J9fFe6GdJv/8z0rrv7Eul0vb+bmuB4DgHvpBGCPMj298E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747628285; 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=bUel07T2/HTvJ6gY1GwCmjy3NTY5KoJHQtLnCUJUAEU=; b=hm8wE3sFbCxxL0DQXOx5FTPBcpuVtwRcSZfIHLKSMfN6BC1lL/VklrRrMO7bHSHe/mjsAJs2/hjwoNUIWTK18aVugSgzT3w03P9j7Sqr4N+C+QT4ayBBD+eQTGl7Z7NBQoewTeGXgYMOMjKlFR1NkGXu9WqejJG9m+RoeTfRptY= 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 174762828591038.48562526799651; Sun, 18 May 2025 21:18:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uGrvM-0004zV-0h; Mon, 19 May 2025 00:16:24 -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 1uGrp6-00006A-H2 for qemu-devel@nongnu.org; Mon, 19 May 2025 00:10:00 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uGrp4-0004Pr-OF for qemu-devel@nongnu.org; Mon, 19 May 2025 00:09:56 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-231e011edfaso27288075ad.0 for ; Sun, 18 May 2025 21:09:54 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231ecd5ea41sm41750035ad.228.2025.05.18.21.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 May 2025 21:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747627793; x=1748232593; 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=bUel07T2/HTvJ6gY1GwCmjy3NTY5KoJHQtLnCUJUAEU=; b=SM3PalkiXrCxgzQLxniBirgUMFuogBybo4XQ+0+snlXtwd8Mv72Veba85nqOReijgb FD7bNhzKwWQYRU/+9+sRV2vvy4p7BwJeZHauAz42TS6yUI0iAkwyRdyIBst99CsuMW6d FAmXfP2vXdMx8IErLXXEXRWjecZOl6FliL2uGTmbWeV5uzXYi6Wu8AFSc4m5e2XcHcfT az/+pffx9tzYthou0okS2+41pR0cBPjNIaGEZ/Bx7YyBRJKcwGG5PyRTln1N2QiAmrhy NF/GhDKH5Uf7F9JQvKlB2P0lB6TgRG9nytcv4rFvh6Q9uT3bHENfIxsA5hqdNSyjHLCO HVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747627793; x=1748232593; 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=bUel07T2/HTvJ6gY1GwCmjy3NTY5KoJHQtLnCUJUAEU=; b=msvt4GfGjkaVxRMtDNHvy6byrnZJvN8bKZ1U7ZPosPxqooz7j0550Bfai4OSHW++Pn Az+vudmtM2Ak+SK6e/krYoHqGumXHZb7TYOUXUl8X2Kil94skSIwEXCHzbRkHY8UYuL0 v+YEVVfR/rs8Ixk1GH2ASTXYeePwdXjRy+KSOe6ecWm8l7XKxn9W/TiCVnuQ/Oo1/7h5 I3GoZLfdqMBzGYCS2sTAsSMNcjKBCiOUyldu4HZvpDm9npxjDbwJjkkPGn+QLL2q6Det FE4M/9G7D1t1+xu7HgOJxMn4HnR6fqDw3NSoxn4HlJPYK4HnVe8rnCTJr9HmFpTRj6e7 sUxQ== X-Gm-Message-State: AOJu0YyMhtnUiTQAbC6FctgR/ZZjhwpCGAic5EOGKXNldWV6VdxgZdaH 5XljnDsoFWeLtmfa2Fn3+2MpwwWcomnbb40TI9kj9U3TxKxb9B6Yq0jWXlnKhg== X-Gm-Gg: ASbGncv9OeuDkNq9FhBNn+pMynLmAevXzIP2jmoxGQWnMNNjWvtxyMdT5pZ2OREnNlM uEb89hkhpuahl9n1Qm8OYz67hozCFzPIoD4IJVaB6i8lVc4edHGV88zvI5ZVOb2Orf5HK/53VbO 27evAJEwl5Ce9DTHGfjnFncldyd2F5CfeIr6myVnwJxKP3b2U09h+U666gEJcC0qCw6N5qmEh3S GjF6hyi0m0OwD7WmcJf61jzUZU8muMnJ0suj/b37jGgGFDkbPtMtmFfd91qP6qMheQhFdRynLv0 KjKBEi7ghXzE4BzSyno8Ya8KpySSnBzwkxLNdnlbmpamkEc9yt5XISPvCVQziz10861uKvKJqg2 5M3qyG9U+bOf279HPIMwHva0kuwwLkf6FACdneGb33YMeVMU6uHAL0eXw X-Google-Smtp-Source: AGHT+IH9fqUZrtkC5hWQMTn99H9X7r9jPEkKrrO5YVoc9icGHi5nEsHaQrirIjyUTif4qZO6QDCEBg== X-Received: by 2002:a17:903:324c:b0:231:e331:b7c8 with SMTP id d9443c01a7336-231e331bbedmr113702865ad.17.1747627792935; Sun, 18 May 2025 21:09:52 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Daniel Henrique Barboza , Alistair Francis Subject: [PULL 52/56] hw/riscv/virt.c: use s->memmap in create_fdt() path Date: Mon, 19 May 2025 14:05:49 +1000 Message-ID: <20250519040555.3797167-53-alistair.francis@wdc.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250519040555.3797167-1-alistair.francis@wdc.com> References: <20250519040555.3797167-1-alistair.francis@wdc.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::634; envelope-from=alistair23@gmail.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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 @gmail.com) X-ZM-MESSAGEID: 1747628287871116600 Content-Type: text/plain; charset="utf-8" From: Daniel Henrique Barboza create_fdt(), create_fdt_flash() and create_fdt_fw_cfg() can access the memmap via their RISCVVirtState pointers. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Message-ID: <20250429125811.224803-6-dbarboza@ventanamicro.com> Signed-off-by: Alistair Francis --- hw/riscv/virt.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 3d547f7c2b..8a703a0233 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -996,7 +996,7 @@ static void create_fdt_rtc(RISCVVirtState *s, const Mem= MapEntry *memmap, } } =20 -static void create_fdt_flash(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_flash(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); hwaddr flashsize =3D s->memmap[VIRT_FLASH].size / 2; @@ -1011,11 +1011,11 @@ static void create_fdt_flash(RISCVVirtState *s, con= st MemMapEntry *memmap) qemu_fdt_setprop_cell(ms->fdt, name, "bank-width", 4); } =20 -static void create_fdt_fw_cfg(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt_fw_cfg(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); - hwaddr base =3D memmap[VIRT_FW_CFG].base; - hwaddr size =3D memmap[VIRT_FW_CFG].size; + hwaddr base =3D s->memmap[VIRT_FW_CFG].base; + hwaddr size =3D s->memmap[VIRT_FW_CFG].size; g_autofree char *nodename =3D g_strdup_printf("/fw-cfg@%" PRIx64, base= ); =20 qemu_fdt_add_subnode(ms->fdt, nodename); @@ -1146,7 +1146,7 @@ static void finalize_fdt(RISCVVirtState *s) create_fdt_rtc(s, s->memmap, irq_mmio_phandle); } =20 -static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap) +static void create_fdt(RISCVVirtState *s) { MachineState *ms =3D MACHINE(s); uint8_t rng_seed[32]; @@ -1173,7 +1173,8 @@ static void create_fdt(RISCVVirtState *s, const MemMa= pEntry *memmap) * The "/soc/pci@..." node is needed for PCIE hotplugs * that might happen before finalize_fdt(). */ - name =3D g_strdup_printf("/soc/pci@%lx", (long) memmap[VIRT_PCIE_ECAM]= .base); + name =3D g_strdup_printf("/soc/pci@%lx", + (long) s->memmap[VIRT_PCIE_ECAM].base); qemu_fdt_add_subnode(ms->fdt, name); =20 qemu_fdt_add_subnode(ms->fdt, "/chosen"); @@ -1185,8 +1186,8 @@ static void create_fdt(RISCVVirtState *s, const MemMa= pEntry *memmap) =20 qemu_fdt_add_subnode(ms->fdt, "/aliases"); =20 - create_fdt_flash(s, memmap); - create_fdt_fw_cfg(s, memmap); + create_fdt_flash(s); + create_fdt_fw_cfg(s); create_fdt_pmu(s); } =20 @@ -1715,7 +1716,7 @@ static void virt_machine_init(MachineState *machine) exit(1); } } else { - create_fdt(s, s->memmap); + create_fdt(s); } =20 if (virt_is_iommu_sys_enabled(s)) { --=20 2.49.0