diff options
author | Alexander Graf <agraf@suse.de> | 2012-06-06 01:01:23 +0200 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2012-06-24 01:04:50 +0200 |
commit | 4b1b1c896fb38d435f3d350c44b1bdc8b56600a4 (patch) | |
tree | e928cf90e18fdb147900ab1db15f3fc2a0ff4ec6 | |
parent | 3627757e32e2c9fcee84e218746639aa2bfb1723 (diff) |
dt: Add global option to set phandle start offset
If anyone outside of QEMU wants to mess with a QEMU generated device tree,
he needs to know which range phandles are valid in. So let's expose a
machine option that an external program can use to set the start allocate
id for phandles in QEMU.
Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r-- | device_tree.c | 28 | ||||
-rw-r--r-- | qemu-config.c | 4 |
2 files changed, 31 insertions, 1 deletions
diff --git a/device_tree.c b/device_tree.c index cc83f0fb01..acae53e6b6 100644 --- a/device_tree.c +++ b/device_tree.c @@ -22,6 +22,8 @@ #include "qemu-common.h" #include "device_tree.h" #include "hw/loader.h" +#include "qemu-option.h" +#include "qemu-config.h" #include <libfdt.h> @@ -200,7 +202,31 @@ int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, uint32_t qemu_devtree_alloc_phandle(void *fdt) { - static int phandle = 0x8000; + static int phandle = 0x0; + + /* + * We need to find out if the user gave us special instruction at + * which phandle id to start allocting phandles. + */ + if (!phandle) { + QemuOpts *machine_opts; + machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); + if (machine_opts) { + const char *phandle_start; + phandle_start = qemu_opt_get(machine_opts, "phandle_start"); + if (phandle_start) { + phandle = strtoul(phandle_start, NULL, 0); + } + } + } + + if (!phandle) { + /* + * None or invalid phandle given on the command line, so fall back to + * default starting point. + */ + phandle = 0x8000; + } return phandle++; } diff --git a/qemu-config.c b/qemu-config.c index 5bbebafa1b..2cd27262e9 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -587,6 +587,10 @@ static QemuOptsList qemu_machine_opts = { .name = "dumpdtb", .type = QEMU_OPT_STRING, .help = "Dump current dtb to a file and quit", + }, { + .name = "phandle_start", + .type = QEMU_OPT_STRING, + .help = "The first phandle ID we may generate dynamically", }, { /* End of list */ } }, |