From nobody Sat Oct 25 08:57:52 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 1520370204123708.1537224218316; Tue, 6 Mar 2018 13:03:24 -0800 (PST) Received: from localhost ([::1]:58173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJk3-0004UG-BI for importer@patchew.org; Tue, 06 Mar 2018 16:03:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etJSY-0005sc-09 for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etJSW-0003CC-2C for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:17 -0500 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:39794) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etJSV-00039i-Os for qemu-devel@nongnu.org; Tue, 06 Mar 2018 15:45:15 -0500 Received: by mail-pl0-x242.google.com with SMTP id s13-v6so12553388plq.6 for ; Tue, 06 Mar 2018 12:45:15 -0800 (PST) Received: from localhost.localdomain (125-237-39-90-fibre.bb.spark.co.nz. [125.237.39.90]) by smtp.gmail.com with ESMTPSA id y6sm39123791pfg.71.2018.03.06.12.45.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 12:45:14 -0800 (PST) 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; bh=/WgF+7L8rqtVMPdi+GaC7sBRMRHSu39wVy01UzZZqgs=; b=FCAhAP+1oi+e4CbY50VuOjxWXQhAIz6W46D1sBOomWkV82YTvcIAK0F3zM28g00wjW HCPHnKbsiwlCAtO0nYSvurPONQAaHTa9zuEZ5XSVxXsuOfgXekpqYpBau61v5YPbZqqB pFecqFgwmTVYas9CNwCh2VpDZztBkXWuATJtUhfCgic8T/z+JKxzare6mz8caGiL7XZu sT3+dR6mSI+uIvulf2XLIlavuyNYKnlPX6iqtiXZRGOk++Dy/IkG4ly8JQ6cbn1ElDO0 daba5GeBueJkBUj3Qm80dGZSkTU56gsM/XFVlcfbtYEzSdcKNtH2nN276N+E4jNCvbV8 sGow== 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; bh=/WgF+7L8rqtVMPdi+GaC7sBRMRHSu39wVy01UzZZqgs=; b=hSO7mpfa7gsh60cwe/G69JxFVr40Odggh7kj8fwnFCOJ5B/fg9p9w+AgBr0g1kbPlB 16lAt8zAq9vy5r5jE+ebZwP40gsgFqdA/QPPJDS1hh/Fe3RoqxaYMNMDVwhe2/vb+T70 P2G3FRXVYz0W0Wqdvoh1r3A9j8wgSU2kqenppst87N2u5CUmJp2VmYshMSkl1goHMhoW +WQMO8a/kqj0za9uRHQruniZDG2hjNXF18u5HXI7Yv72ZyqyhwJcLaPHF3j85mx/hCYT YbzzV83xu6Uf4RwjK8MNkyobiKstWToi+R/qrQ//pIzicNFBEaUE3C7RKRl6FCWqH2Ot a3ew== X-Gm-Message-State: APf1xPDMNYkY4uCqE6Js0V1yr7t3A9Gef36+csoTl7DfIX3dwaAHUQBs 9kYb0eHfCXesFpHnbsfGtk0CQyDLZ0o= X-Google-Smtp-Source: AG47ELsksOgK8Wb7xMC+kzW6U5Tr1vgIV4NY5DzefXjcU43fz7wJnBbQV3wrPaTxbXXwpKVT4u+plA== X-Received: by 2002:a17:902:4001:: with SMTP id b1-v6mr17128802pld.28.1520369114585; Tue, 06 Mar 2018 12:45:14 -0800 (PST) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 09:43:36 +1300 Message-Id: <1520369037-37977-2-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1520369037-37977-1-git-send-email-mjc@sifive.com> References: <1520369037-37977-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v1 01/22] 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: Bastian Koppelmann , Michael Clark , Palmer Dabbelt , Sagar Karandikar , RISC-V Patches 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Michael Clark Signed-off-by: Palmer Dabbelt --- 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