From nobody Sat Oct 25 21:46:17 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 1521229639428984.6821870024455; Fri, 16 Mar 2018 12:47:19 -0700 (PDT) Received: from localhost ([::1]:59218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvJu-0002hO-0w for importer@patchew.org; Fri, 16 Mar 2018 15:47:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewvF7-0007Jd-4Y 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 1ewvF3-0003go-Q4 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:21 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:39335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewvF3-0003gW-JX for qemu-devel@nongnu.org; Fri, 16 Mar 2018 15:42:17 -0400 Received: by mail-pg0-x242.google.com with SMTP id e3so4461653pga.6 for ; Fri, 16 Mar 2018 12:42:17 -0700 (PDT) Received: from monty.com ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id k24sm13780469pff.77.2018.03.16.12.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Mar 2018 12:42:15 -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=bAnmiNe0Jq/bKPe/yscQG8mYo4LaV7stvbgTiCOkIvc=; b=SKqskxgeU1LsHjtpSLNu6IQEB8pNwSMRJmyeSV37OUp8GMtihkirVixySc+9+P5GxO G/KpbS2ikS59qHuzqM2Rm/v2dJk/CqCNI5SpT0h/kBmH3u+No1P1uDCslN+VxRhd2H3e He5YYmxZF6y4u8bSWpQHYJYvlXJZz+yTUJ9qmshU2L+2Gcy//lFlxOmJXwAOp/1KlnN9 DJgcfmeOHHGHditqLP+vXCudIntBpVHdWKNhxIUGsSN1TaBv67bBdjY9mtrXjYB4s9lL y9Pcb1yJVqUneQeznhmrC1xR2CosBWV5P1xjMnZqmjGJvx5a/ld1jwOU7C/GQfH9W3Os 99kg== 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=bAnmiNe0Jq/bKPe/yscQG8mYo4LaV7stvbgTiCOkIvc=; b=jD9RckDogQclL51lwdGEy1Ph8Pc3uT7L/+IsYgr2AJ3pKuoJP+ZzDJ4znTHqksCzyP Ocf0zmkqFzxGCJfQ6c1mdu4rVO1nyUtMvtsZv9qiPyb6794n2lcHgW4meg8Y7f8nkObx lOipqlzt9/3rQ4cHbYes/aCgzqZlxQQ43d6lQFkVQSPjA2C9fo0rvcJ0GFLNwMNnDzHH EKuIS8yDEgWLJ5WWPa5sFQtwoWpbzmYT5HmVt+azbswKOIzWnb8yIaeSzX0dFTix6Ghb cMp+zjO+6nMtTi/z8aVpk/iwuvvp37/sALv6t6C+Dvx3Ns6QNSBxBLpFiMQvql43EvJ+ SL3Q== X-Gm-Message-State: AElRT7Ga1v4nrDxu6Vvmcx90a/CR2R5lVjeZe8KhBA+OCVw3grfrtcMk SkZNqy3PYP9xnur2+cERP/4/Me4oRLU= X-Google-Smtp-Source: AG47ELt+rAHm/qc+/2ZfMLjPwbG4kVKjvPnNpOG0+46NAUiItKytC4qMe/F/TkdluMsmmKkD5pFIlw== X-Received: by 10.101.82.198 with SMTP id z6mr2372618pgp.41.1521229336478; Fri, 16 Mar 2018 12:42:16 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Fri, 16 Mar 2018 12:40:58 -0700 Message-Id: <1521229281-73637-2-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:c05::242 Subject: [Qemu-devel] [PATCH v3 01/24] RISC-V: Make virt create_fdt interface consistent 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 create_fdt sets the fdt variable on RISCVVirtState and this is used to access the fdt. This reverts a change introduced in https://github.com/riscv/riscv-qemu/pull/109 which introduced a redundant return value, overlooking the RISCVVirtState structure member that made create_fdt inconsistent with the other RISC-V machines. The other alternative is to change the other boards to return the fdt. Note: the RISCVVirtState also contains fdt_size. 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 | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e2c214e..37968d2 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -108,7 +108,7 @@ static hwaddr load_initrd(const char *filename, uint64_= t mem_size, return *start + size; } =20 -static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memma= p, +static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, uint64_t mem_size, const char *cmdline) { void *fdt; @@ -264,8 +264,6 @@ static void *create_fdt(RISCVVirtState *s, const struct= MemmapEntry *memmap, qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename); qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); g_free(nodename); - - return fdt; } =20 static void riscv_virt_board_init(MachineState *machine) @@ -279,7 +277,6 @@ static void riscv_virt_board_init(MachineState *machine) char *plic_hart_config; size_t plic_hart_config_len; int i; - void *fdt; =20 /* Initialize SOC */ object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); @@ -299,7 +296,7 @@ static void riscv_virt_board_init(MachineState *machine) main_mem); =20 /* create device tree */ - fdt =3D create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdli= ne); + create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); =20 /* boot rom */ memory_region_init_ram(boot_rom, NULL, "riscv_virt_board.bootrom", @@ -314,9 +311,9 @@ static void riscv_virt_board_init(MachineState *machine) hwaddr end =3D load_initrd(machine->initrd_filename, machine->ram_size, kernel_entry, &start); - qemu_fdt_setprop_cell(fdt, "/chosen", - "linux,initrd-start", start); - qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-start", + start); + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", end); } } --=20 2.7.0