From: Joel Stanley Date: Wed, 4 Jun 2025 02:54:37 +0000 (+0930) Subject: hw/riscv/virt: Fix clint base address type X-Git-Tag: v10.1.0-rc0~31^2~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81a245091fff2651f14004d1820f7ee77dd4f0fc;p=thirdparty%2Fqemu.git hw/riscv/virt: Fix clint base address type The address is a hardware address, so use hwaddr for consistency with the rest of the machine. Reviewed-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Signed-off-by: Joel Stanley Message-ID: <20250604025450.85327-2-joel@jms.id.au> Signed-off-by: Alistair Francis --- diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index cf280a92e5a..875eb7155a3 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -324,7 +324,7 @@ static void create_fdt_socket_clint(RISCVVirtState *s, int cpu; g_autofree char *clint_name = NULL; g_autofree uint32_t *clint_cells = NULL; - unsigned long clint_addr; + hwaddr clint_addr; MachineState *ms = MACHINE(s); static const char * const clint_compat[2] = { "sifive,clint0", "riscv,clint0" @@ -340,8 +340,8 @@ static void create_fdt_socket_clint(RISCVVirtState *s, } clint_addr = s->memmap[VIRT_CLINT].base + - (s->memmap[VIRT_CLINT].size * socket); - clint_name = g_strdup_printf("/soc/clint@%lx", clint_addr); + s->memmap[VIRT_CLINT].size * socket; + clint_name = g_strdup_printf("/soc/clint@%"HWADDR_PRIx, clint_addr); qemu_fdt_add_subnode(ms->fdt, clint_name); qemu_fdt_setprop_string_array(ms->fdt, clint_name, "compatible", (char **)&clint_compat,