From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Chris Wulff" <crwulff@gmail.com>, "Marek Vasut" <marex@denx.de>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v8 06/16] hw/nios2: set machine->fdt in nios2_load_dtb()
Date: Mon, 26 Sep 2022 14:38:45 -0300 [thread overview]
Message-ID: <20220926173855.1159396-7-danielhb413@gmail.com> (raw)
In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com>
This will enable support for 'dumpdtb' QMP/HMP command for all nios2
machines that uses nios2_load_dtb().
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/nios2/boot.c | 8 +++++++-
hw/nios2/meson.build | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 21cbffff47..b30a7b1efb 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -43,6 +43,8 @@
#include "boot.h"
+#include <libfdt.h>
+
#define NIOS2_MAGIC 0x534f494e
static struct nios2_boot_info {
@@ -81,6 +83,7 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize,
const char *kernel_cmdline, const char *dtb_filename)
{
+ MachineState *machine = MACHINE(qdev_get_machine());
int fdt_size;
void *fdt = NULL;
int r;
@@ -113,7 +116,10 @@ static int nios2_load_dtb(struct nios2_boot_info bi, const uint32_t ramsize,
}
cpu_physical_memory_write(bi.fdt, fdt, fdt_size);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
+
return fdt_size;
}
diff --git a/hw/nios2/meson.build b/hw/nios2/meson.build
index 6c58e8082b..22277bd6c5 100644
--- a/hw/nios2/meson.build
+++ b/hw/nios2/meson.build
@@ -1,5 +1,5 @@
nios2_ss = ss.source_set()
-nios2_ss.add(files('boot.c'))
+nios2_ss.add(files('boot.c'), fdt)
nios2_ss.add(when: 'CONFIG_NIOS2_10M50', if_true: files('10m50_devboard.c'))
nios2_ss.add(when: 'CONFIG_NIOS2_GENERIC_NOMMU', if_true: files('generic_nommu.c'))
--
2.37.3
next prev parent reply other threads:[~2022-09-26 19:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 17:38 [PATCH v8 00/16] QMP/HMP: introduce 'dumpdtb' Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 01/16] qmp/hmp, device_tree.c: introduce dumpdtb Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 02/16] hw/core: free ms->fdt in machine_finalize() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 03/16] hw/arm: do not free machine->fdt in arm_load_dtb() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 04/16] hw/mips: set machine->fdt in boston_mach_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 05/16] hw/microblaze: set machine->fdt in microblaze_load_dtb() Daniel Henrique Barboza
2022-09-26 17:38 ` Daniel Henrique Barboza [this message]
2022-09-26 17:38 ` [PATCH v8 07/16] hw/ppc: set machine->fdt in ppce500_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 08/16] hw/ppc: set machine->fdt in bamboo_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 09/16] hw/ppc: set machine->fdt in sam460ex_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 10/16] hw/ppc: set machine->fdt in xilinx_load_device_tree() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 11/16] hw/ppc: set machine->fdt in pegasos2_machine_reset() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 12/16] hw/ppc: set machine->fdt in pnv_reset() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 13/16] hw/ppc: set machine->fdt in spapr machine Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 14/16] hw/riscv: set machine->fdt in sifive_u_machine_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 15/16] hw/riscv: set machine->fdt in spike_board_init() Daniel Henrique Barboza
2022-09-26 17:38 ` [PATCH v8 16/16] hw/xtensa: set machine->fdt in xtfpga_init() Daniel Henrique Barboza
2022-10-08 10:52 ` [PATCH v8 00/16] QMP/HMP: introduce 'dumpdtb' Daniel Henrique Barboza
2022-10-15 12:06 ` Daniel Henrique Barboza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220926173855.1159396-7-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=crwulff@gmail.com \
--cc=f4bug@amsat.org \
--cc=marex@denx.de \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).