From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>
Subject: [PATCH v8 16/16] hw/xtensa: set machine->fdt in xtfpga_init()
Date: Mon, 26 Sep 2022 14:38:55 -0300 [thread overview]
Message-ID: <20220926173855.1159396-17-danielhb413@gmail.com> (raw)
In-Reply-To: <20220926173855.1159396-1-danielhb413@gmail.com>
This will enable support for the 'dumpdtb' QMP/HMP command for all
xtensa machines that uses a FDT.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/xtensa/meson.build | 2 +-
hw/xtensa/xtfpga.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/xtensa/meson.build b/hw/xtensa/meson.build
index 1d5835df4b..ebba51cc74 100644
--- a/hw/xtensa/meson.build
+++ b/hw/xtensa/meson.build
@@ -6,6 +6,6 @@ xtensa_ss.add(files(
))
xtensa_ss.add(when: 'CONFIG_XTENSA_SIM', if_true: files('sim.c'))
xtensa_ss.add(when: 'CONFIG_XTENSA_VIRT', if_true: files('virt.c'))
-xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: files('xtfpga.c'))
+xtensa_ss.add(when: 'CONFIG_XTENSA_XTFPGA', if_true: [files('xtfpga.c'), fdt])
hw_arch += {'xtensa': xtensa_ss}
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 2a5556a35f..867427c3d9 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -50,6 +50,8 @@
#include "hw/xtensa/mx_pic.h"
#include "migration/vmstate.h"
+#include <libfdt.h>
+
typedef struct XtfpgaFlashDesc {
hwaddr base;
size_t size;
@@ -377,7 +379,9 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
cur_tagptr = put_tag(cur_tagptr, BP_TAG_FDT,
sizeof(dtb_addr), &dtb_addr);
cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB);
- g_free(fdt);
+
+ /* Set machine->fdt for 'dumpdtb' QMP/HMP command */
+ machine->fdt = fdt;
}
#else
if (dtb_filename) {
--
2.37.3
next prev parent reply other threads:[~2022-09-26 19:07 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 ` [PATCH v8 06/16] hw/nios2: set machine->fdt in nios2_load_dtb() Daniel Henrique Barboza
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 ` Daniel Henrique Barboza [this message]
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-17-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--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).