[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC PATCH 2/6] device_tree: add qemu_fdt_add_path
From: |
Andrew Jones |
Subject: |
[Qemu-arm] [RFC PATCH 2/6] device_tree: add qemu_fdt_add_path |
Date: |
Wed, 4 Jul 2018 14:49:19 +0200 |
qemu_fdt_add_path works like qemu_fdt_add_subnode, except it
also recursively adds any missing parent nodes.
Cc: Peter Crosthwaite <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Andrew Jones <address@hidden>
---
device_tree.c | 24 ++++++++++++++++++++++++
include/sysemu/device_tree.h | 1 +
2 files changed, 25 insertions(+)
diff --git a/device_tree.c b/device_tree.c
index 6d9c9726f66c..ad570a4dbe3a 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -520,6 +520,30 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
return retval;
}
+int qemu_fdt_add_path(void *fdt, const char *path)
+{
+ char *parent;
+ int offset;
+
+ offset = fdt_path_offset(fdt, path);
+ if (offset < 0 && offset != -FDT_ERR_NOTFOUND) {
+ error_report("%s Couldn't find node %s: %s", __func__, path,
+ fdt_strerror(offset));
+ exit(1);
+ }
+
+ if (offset != -FDT_ERR_NOTFOUND) {
+ return offset;
+ }
+
+ parent = g_strdup(path);
+ strrchr(parent, '/')[0] = '\0';
+ qemu_fdt_add_path(fdt, parent);
+ g_free(parent);
+
+ return qemu_fdt_add_subnode(fdt, path);
+}
+
void qemu_fdt_dumpdtb(void *fdt, int size)
{
const char *dumpdtb = qemu_opt_get(qemu_get_machine_opts(), "dumpdtb");
diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h
index c16fd69bc0b1..d62fc873a3ea 100644
--- a/include/sysemu/device_tree.h
+++ b/include/sysemu/device_tree.h
@@ -101,6 +101,7 @@ uint32_t qemu_fdt_get_phandle(void *fdt, const char *path);
uint32_t qemu_fdt_alloc_phandle(void *fdt);
int qemu_fdt_nop_node(void *fdt, const char *node_path);
int qemu_fdt_add_subnode(void *fdt, const char *name);
+int qemu_fdt_add_path(void *fdt, const char *path);
#define qemu_fdt_setprop_cells(fdt, node_path, property, ...) \
do { \
--
2.17.1
- [Qemu-arm] [RFC PATCH 0/6] hw/arm/virt: Introduce cpu topology support, Andrew Jones, 2018/07/04
- [Qemu-arm] [RFC PATCH 1/6] hw/arm/virt: Add virt-3.1 machine type, Andrew Jones, 2018/07/04
- [Qemu-arm] [RFC PATCH 3/6] hw/arm/virt: DT: add cpu-map, Andrew Jones, 2018/07/04
- [Qemu-arm] [RFC PATCH 2/6] device_tree: add qemu_fdt_add_path,
Andrew Jones <=
- [Qemu-arm] [RFC PATCH 4/6] hw/arm/virt-acpi-build: distinguish possible and present cpus, Andrew Jones, 2018/07/04
- [Qemu-arm] [RFC PATCH 5/6] virt-acpi-build: add PPTT table, Andrew Jones, 2018/07/04
- [Qemu-arm] [RFC PATCH 6/6] hw/arm/virt: cpu topology: don't allow threads, Andrew Jones, 2018/07/04