From nobody Sat Oct 25 21:46:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521229491854253.6249110557883; Fri, 16 Mar 2018 12:44:51 -0700 (PDT) Received: from localhost ([::1]:59201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvH2-0000DX-Je for importer@patchew.org; Fri, 16 Mar 2018 15:44:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvF7-0007Jm-N0 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewvF6-0003i3-Qf for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:21 -0400 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:33848) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewvF6-0003hl-K5 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:20 -0400 Received: by mail-pl0-x241.google.com with SMTP id u11-v6so2848567plq.1 for ; Fri, 16 Mar 2018 12:42:20 -0700 (PDT) Received: from monty.com ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id k24sm13780469pff.77.2018.03.16.12.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Mar 2018 12:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=etZGfs2I6eIUVzklmG0XvLcDBBdWMcIvQq939Ceof5k=; b=i5acHagiFdgmwVHCgOwsDdB/2C80TWTkMesoHLnvpVHhxjAWxAfJEeUMyueNPNGfWg dRlzSG3aPhzv7yofpic4MuqfVTsmFjfUAdNWfAXSHY7DNjSNwzDPtT9pWE8QZunnDsD1 X4g3u3fN4wUVqo8srzid6wQ3Z8QEIxS9+OTnlI6d0256O4iw9XYWpj7fqf3tctodIaLs D9WpAYPsHqPxFXSqloOCe4UsYkyJIzAzD8ILqxan+Ex3DjXXKaAZIriNxz8QrMZJR8Tr pAvEF7ZnkzfS0+Zc5fBgZoK2bsWFauxv2JkC2daTWZg7Tx1g7i8clfIfkirRC+iVurz7 HUNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=etZGfs2I6eIUVzklmG0XvLcDBBdWMcIvQq939Ceof5k=; b=gTUcBIv8xYVs3ynsYy/ZzzzaU5/hOsn7f27xSqBc76x3B88GrukH+wjOa/TJz+PTC+ fAJWLXpNzV4ztn5fY0ahdyVvBzn+CYndgqMQnVeWJHpvCJUwfJfGFfho4Bt4ojBwexkK AB4Tnjz04LQDSEKSx1O4J2Cc6IxgRlScILpzyB0lo3A4pir9Xzppun/rJUf+XskmLZdg 984DLIEr85/9ij0Kx8rrqRkVSujbzFggzUgwcyoeQuaRhE0a+9kjJJswra5MnUvuJ/jF HBTVydCHNKR+pFWOZOHopMBXKzfesrI41RJK7KiUS556VbFzGEl+0qM0ddrtYXq5Hirt BnVw== X-Gm-Message-State: AElRT7HX6Xh/7haV8uhgy1CIOuBSujhtmZg9U5HOD1QcnC5Q5nxGHZjP QCugflOgjlo4iTx5DDOxlnU7i6a9XhM= X-Google-Smtp-Source: AG47ELvg9sI5ZwFTbfJEKB8tVCSkW64QI6Yn9v5Go6EjmoElJ8VKe515YNWAfVgZlNh4geQz6jPRVA== X-Received: by 2002:a17:902:c24:: with SMTP id 33-v6mr3423595pls.88.1521229339332; Fri, 16 Mar 2018 12:42:19 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Fri, 16 Mar 2018 12:41:01 -0700 Message-Id: <1521229281-73637-5-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1521229281-73637-1-git-send-email-mjc@sifive.com> References: <1521229281-73637-1-git-send-email-mjc@sifive.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v3 04/24] RISC-V: Use ROM base address and size from memmap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: patches@groups.riscv.org, Michael Clark , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Another case of replacing hard coded constants, this time referring to the definition in the virt machine's memmap. Cc: Sagar Karandikar Cc: Bastian Koppelmann Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/virt.c | 4 ++-- include/hw/riscv/virt.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 0055439..0d101fc 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -338,11 +338,11 @@ static void riscv_virt_board_init(MachineState *machi= ne) }; =20 /* copy in the reset vector */ - copy_le32_to_phys(ROM_BASE, reset_vec, sizeof(reset_vec)); + copy_le32_to_phys(memmap[VIRT_MROM].base, reset_vec, sizeof(reset_vec)= ); =20 /* copy in the device tree */ qemu_fdt_dumpdtb(s->fdt, s->fdt_size); - cpu_physical_memory_write(ROM_BASE + sizeof(reset_vec), + cpu_physical_memory_write(memmap[VIRT_MROM].base + sizeof(reset_vec), s->fdt, s->fdt_size); =20 /* create PLIC hart topology configuration string */ diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 2fbe808..655e85d 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -23,8 +23,6 @@ #define VIRT(obj) \ OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD) =20 -enum { ROM_BASE =3D 0x1000 }; - typedef struct { /*< private >*/ SysBusDevice parent_obj; --=20 2.7.0