add qemu_fdt_setprop_strings() and use it in most places
Subsystems (2)
Add a helper for qemu_fdt_setprop_strings() to take a set of strings to put into a device-tree, which removes several open-coded methods such as setting an char arr[] = {..} or setting char val[] = "str\0str2";
This is for hw/arm, hw/mips and hw/riscv as well as a couple of cores. It is not fully tested over all of those, I may not have caught all places this is to be replaced.
PATCH v3 1/5 device_tree: add qemu_fdt_setprop_strings() helper
Add a helper to set a property from a set of strings to reduce the following code:
static const char * const clint_compat[2] = {
"sifive,clint0", "riscv,clint0"
};
qemu_fdt_setprop_string_array(fdt, nodename, "compatible",
(char **)&clint_compat, ARRAY_SIZE(clint_compat));---
v3;
- fix return value for the call
- add better help text
v2:
- fix node/path in comment
--- include/sysemu/device_tree.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
include/sysemu/device_tree.h +19 -0
@@ -87,6 +87,25 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,int qemu_fdt_setprop_string_array (void *fdt,const char *node_path,const char *prop,char **array,int len); +/** +* qemu_fdt_setprop_strings: set a property from a set of strings +* +* @fdt: pointer to the dt blob +* @path: node name +* @prop: property array +* +* This is a helper for the qemu_fdt_setprop_string_array() function +* which takes a va-arg set of strings instead of having to setup a +* single use string array. +*/ +#define qemu_fdt_setprop_strings (fdt, path, prop, ...) \ + ({ int __ret; do { \ + static const char * const __strs[] = { __VA_ARGS__ }; \ + __ret = qemu_fdt_setprop_string_array(fdt, path, prop, \ + (char **)&__strs, ARRAY_SIZE(__strs)); \ + } while(0); __ret; }) + +int qemu_fdt_setprop_phandle (void *fdt,const char *node_path,const char *property,const char *target_node_path);
Signature · 1 line
2.35.1
Re: [PATCH v3 1/5] device_tree: add qemu_fdt_setprop_strings() helper
Quoted 36 lines · Ben Dooks
Add a helper to set a property from a set of strings to reduce the following code:
static const char * const clint_compat[2] = { "sifive,clint0", "riscv,clint0" }; qemu_fdt_setprop_string_array(fdt, nodename, "compatible", (char **)&clint_compat, ARRAY_SIZE(clint_compat));Signed-off-by Ben Dooks <[email protected]>---
v3;
- fix return value for the call
- add better help text
v2:
- fix node/path in comment--- include/sysemu/device_tree.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)include/sysemu/device_tree.h +7
-0@@ -87,6 +87,25 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,int qemu_fdt_setprop_string_array (void *fdt,const char *node_path,const char *prop,char **array,int len); +/** +* qemu_fdt_setprop_strings: set a property from a set of strings +* +* @fdt: pointer to the dt blob +* @path: node name +* @prop: property array +*
include/sysemu/device_tree.h int qemu_fdt_setprop_string(void *fdt, const char *node_path, · line 106
Quoted 10 lines
include/sysemu/device_tree.h +10
-0+* This is a helper for the qemu_fdt_setprop_string_array() function +* which takes a va-arg set of strings instead of having to setup a +* single use string array. +*/ +#define qemu_fdt_setprop_strings (fdt, path, prop, ...) \ + ({ int __ret; do { \ + static const char * const __strs[] = { __VA_ARGS__ }; \ + __ret = qemu_fdt_setprop_string_array(fdt, path, prop, \ + (char **)&__strs, ARRAY_SIZE(__strs)); \ + } while(0); __ret; })
The do { } while (0) shouldn't be necessary inside the ({}), but I think we should change the places that are checking the return value of qemu_fdt_setprop_string_array() to not check the return value, because it will always be zero. qemu_fdt_setprop_string_array() calls qemu_fdt_setprop() which exits QEMU on error. Then, after there are no callers checking the return value we can change this macro to
#define qemu_fdt_setprop_strings(fdt, path, prop, ...) \
do { \
static const char * const __strs[] = { __VA_ARGS__ }; \
qemu_fdt_setprop_string_array(fdt, path, prop, \
(char **)&__strs, ARRAY_SIZE(__strs)); \
} while(0)Thanks,
drew
Re: [PATCH v3 1/5] device_tree: add qemu_fdt_setprop_strings() helper
Quoted 46 lines · Andrew Jones
Quoted 45 lines · Ben Dooks
Add a helper to set a property from a set of strings to reduce the following code:
static const char * const clint_compat[2] = { "sifive,clint0", "riscv,clint0" }; qemu_fdt_setprop_string_array(fdt, nodename, "compatible", (char **)&clint_compat, ARRAY_SIZE(clint_compat));Signed-off-by Ben Dooks <[email protected]>---
v3;
- fix return value for the call
- add better help text
v2:
- fix node/path in comment--- include/sysemu/device_tree.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)include/sysemu/device_tree.h +16
-0@@ -87,6 +87,25 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,int qemu_fdt_setprop_string_array (void *fdt,const char *node_path,const char *prop,char **array,int len); +/** +* qemu_fdt_setprop_strings: set a property from a set of strings +* +* @fdt: pointer to the dt blob +* @path: node name +* @prop: property array +* +* This is a helper for the qemu_fdt_setprop_string_array() function +* which takes a va-arg set of strings instead of having to setup a +* single use string array. +*/ +#define qemu_fdt_setprop_strings (fdt, path, prop, ...) \ + ({ int __ret; do { \ + static const char * const __strs[] = { __VA_ARGS__ }; \ + __ret = qemu_fdt_setprop_string_array(fdt, path, prop, \ + (char **)&__strs, ARRAY_SIZE(__strs)); \
Quoted 8 lines
include/sysemu/device_tree.h int qemu_fdt_setprop_string(void *fdt, const char *node_path, · line 106
Quoted 1 line
include/sysemu/device_tree.h +1
-0+ } while(0); __ret; })The do { } while (0) shouldn't be necessary inside the ({}), but I think we should change the places that are checking the return value of
qemu_fdt_setprop_string_array()to not check the return value, because it will always be zero.qemu_fdt_setprop_string_array()callsqemu_fdt_setprop()which exits QEMU on error. Then, after there are no callers checking the return value we can change this macro to
I think I did this due to the hw/ppc changes that /do/ check the return code but are different enough to not be trivially changable.
I'll go back and make this the original do {} while() tongith and post a v4 for people to look. The hw/ppc stuff can stay as is for now.
Thank you for the review.
Signature · 3 lines
Ben Dooks, [email protected], http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.
Re: [PATCH v3 1/5] device_tree: add qemu_fdt_setprop_strings() helper
In reply to Andrew JonesQuoted 55 lines · Andrew Jones
Quoted 36 lines · Ben Dooks
Add a helper to set a property from a set of strings to reduce the following code:
static const char * const clint_compat[2] = { "sifive,clint0", "riscv,clint0" }; qemu_fdt_setprop_string_array(fdt, nodename, "compatible", (char **)&clint_compat, ARRAY_SIZE(clint_compat));Signed-off-by Ben Dooks <[email protected]>---
v3;
- fix return value for the call
- add better help text
v2:
- fix node/path in comment--- include/sysemu/device_tree.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)include/sysemu/device_tree.h +7
-0@@ -87,6 +87,25 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,int qemu_fdt_setprop_string_array (void *fdt,const char *node_path,const char *prop,char **array,int len); +/** +* qemu_fdt_setprop_strings: set a property from a set of strings +* +* @fdt: pointer to the dt blob +* @path: node name +* @prop: property array +* include/sysemu/device_tree.h int qemu_fdt_setprop_string(void *fdt, const char *node_path, · line 106
Quoted 10 lines
include/sysemu/device_tree.h +10
-0+* This is a helper for the qemu_fdt_setprop_string_array() function +* which takes a va-arg set of strings instead of having to setup a +* single use string array. +*/ +#define qemu_fdt_setprop_strings (fdt, path, prop, ...) \ + ({ int __ret; do { \ + static const char * const __strs[] = { __VA_ARGS__ }; \ + __ret = qemu_fdt_setprop_string_array(fdt, path, prop, \ + (char **)&__strs, ARRAY_SIZE(__strs)); \ + } while(0); __ret; })The do { } while (0) shouldn't be necessary inside the ({}), but I think we should change the places that are checking the return value of
qemu_fdt_setprop_string_array()to not check the return value, because it will always be zero.qemu_fdt_setprop_string_array()callsqemu_fdt_setprop()which exits QEMU on error. Then, after there are no callers checking the return value we can change this macro to
Quoted 3 lines
#define qemu_fdt_setprop_strings(fdt, path, prop, ...) \
do { \
static const char * const __strs[] = { __VA_ARGS__ }; \Eh, I just realized I didn't notice the static the first time I read this and so I copy+pasted here in my suggestion. Sorry about that.
Thanks,
drew
Quoted 7 lines
qemu_fdt_setprop_string_array(fdt, path, prop, \ (char **)&__strs, ARRAY_SIZE(__strs)); \ } while(0)Thanks,
drew
PATCH v3 2/5 hw/riscv: use qemu_fdt_setprop_strings() for string arrays
In reply to Ben DooksUse the qemu_fdt_setprop_strings() in sifve_u.c to simplify the code.
--- hw/riscv/sifive_u.c | 18 +++++------------- hw/riscv/spike.c | 7 ++----- hw/riscv/virt.c | 32 ++++++++------------------------ 3 files changed, 15 insertions(+), 42 deletions(-)
hw/riscv/sifive_u.c +5 -13
@@ -103,13 +103,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,char *nodename;uint32_t plic_phandle, prci_phandle, gpio_phandle, phandle =1 ;uint32_t hfclk_phandle, rtcclk_phandle, phy_phandle; -static const char *const ethclk_names[2 ] = {"pclk" ,"hclk" }; -static const char *const clint_compat[2 ] = { -"sifive,clint0" ,"riscv,clint0" - }; -static const char *const plic_compat[2 ] = { -"sifive,plic-1.0.0" ,"riscv,plic0" - };if (ms->dtb) { fdt = s->fdt =load_device_tree (ms->dtb, &s->fdt_size);
@@ -221,11 +214,11 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, nodename =g_strdup_printf ("/soc/clint@%lx" , (long )memmap[SIFIVE_U_DEV_CLINT ].base);qemu_fdt_add_subnode (fdt, nodename); -qemu_fdt_setprop_string_array (fdt, nodename,"compatible" , - (char **)&clint_compat,ARRAY_SIZE (clint_compat));qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_DEV_CLINT ].base,0x0 , memmap[SIFIVE_U_DEV_CLINT ].size); +qemu_fdt_setprop_strings (fdt, nodename,"compatible" , +"sifive,clint0" ,"riscv,clint0" );qemu_fdt_setprop (fdt, nodename,"interrupts-extended" , cells, ms->smp.cpus *sizeof (uint32_t ) *4 );g_free (cells);
@@ -279,8 +272,8 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, (long)memmap[SIFIVE_U_DEV_PLIC].base);qemu_fdt_add_subnode (fdt, nodename);qemu_fdt_setprop_cell (fdt, nodename,"#interrupt-cells" ,1 ); -qemu_fdt_setprop_string_array (fdt, nodename,"compatible" , - (char **)&plic_compat,ARRAY_SIZE (plic_compat)); +qemu_fdt_setprop_strings (fdt, nodename,"compatbile" , +"sifive,plic-1.0.0" ,"riscv,plic0" );qemu_fdt_setprop (fdt, nodename,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop (fdt, nodename,"interrupts-extended" , cells, (ms->smp.cpus *4 -2 ) *sizeof (uint32_t ));
@@ -426,8 +419,7 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , prci_phandle,PRCI_CLK_GEMGXLPLL , prci_phandle,PRCI_CLK_GEMGXLPLL ); -qemu_fdt_setprop_string_array (fdt, nodename,"clock-names" , - (char **)ðclk_names,ARRAY_SIZE (ethclk_names)); +qemu_fdt_setprop_strings (fdt, nodename,"clock-names" ,"pclk" ,"hclk" );qemu_fdt_setprop (fdt, nodename,"local-mac-address" , s->soc.gem.conf.macaddr.a,ETH_ALEN );qemu_fdt_setprop_cell (fdt, nodename,"#address-cells" ,1 );
hw/riscv/spike.c +2 -5
@@ -59,9 +59,6 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,uint32_t cpu_phandle, intc_phandle, phandle =1 ;char *name, *mem_name, *clint_name, *clust_name;char *core_name, *cpu_name, *intc_name; -static const char *const clint_compat[2 ] = { -"sifive,clint0" ,"riscv,clint0" - }; fdt = s->fdt =create_device_tree (&s->fdt_size);if (!fdt) {
@@ -159,8 +156,8 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, (memmap[SPIKE_CLINT ].size * socket); clint_name =g_strdup_printf ("/soc/clint@%lx" , clint_addr);qemu_fdt_add_subnode (fdt, clint_name); -qemu_fdt_setprop_string_array (fdt, clint_name,"compatible" , - (char **)&clint_compat,ARRAY_SIZE (clint_compat)); +qemu_fdt_setprop_strings (fdt, clint_name,"compatible" , +"sifive,clint0" ,"riscv,clint0" );qemu_fdt_setprop_cells (fdt, clint_name,"reg" ,0x0 , clint_addr,0x0 , memmap[SPIKE_CLINT ].size); qemu_fdt_setprop(fdt, clint_name, "interrupts-extended",
hw/riscv/virt.c +8 -24
@@ -261,11 +261,8 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket, intc_phandles[cpu]);if (riscv_feature (&s->soc[socket].harts[cpu].env,RISCV_FEATURE_AIA )) { -static const char *const compat[2 ] = { -"riscv,cpu-intc-aia" ,"riscv,cpu-intc" - }; -qemu_fdt_setprop_string_array (mc->fdt, intc_name,"compatible" , - (char **)&compat,ARRAY_SIZE (compat)); +qemu_fdt_setprop_strings (mc->fdt, intc_name,"compatible" , +"riscv,cpu-intc-aia" ,"riscv,cpu-intc" ); }else {qemu_fdt_setprop_string (mc->fdt, intc_name,"compatible" ,"riscv,cpu-intc" );
@@ -310,9 +307,6 @@ static void create_fdt_socket_clint(RISCVVirtState *s,uint32_t *clint_cells;unsigned long clint_addr;MachineState *mc =MACHINE (s); -static const char *const clint_compat[2 ] = { -"sifive,clint0" ,"riscv,clint0" - }; clint_cells =g_new0 (uint32_t, s->soc[socket].num_harts *4 );
@@ -326,9 +320,8 @@ static void create_fdt_socket_clint(RISCVVirtState *s, clint_addr = memmap[VIRT_CLINT ].base + (memmap[VIRT_CLINT ].size * socket); clint_name =g_strdup_printf ("/soc/clint@%lx" , clint_addr);qemu_fdt_add_subnode (mc->fdt, clint_name); -qemu_fdt_setprop_string_array (mc->fdt, clint_name,"compatible" , - (char **)&clint_compat, -ARRAY_SIZE (clint_compat)); +qemu_fdt_setprop_strings (mc->fdt, clint_name,"compatible" , +"sifive,clint0" ,"riscv,clint0" );qemu_fdt_setprop_cells (mc->fdt, clint_name,"reg" ,0x0 , clint_addr,0x0 , memmap[VIRT_CLINT ].size); qemu_fdt_setprop(mc->fdt, clint_name, "interrupts-extended",
@@ -437,9 +430,6 @@ static void create_fdt_socket_plic(RISCVVirtState *s,uint32_t *plic_cells;unsigned long plic_addr;MachineState *mc =MACHINE (s); -static const char *const plic_compat[2 ] = { -"sifive,plic-1.0.0" ,"riscv,plic0" - };if (kvm_enabled ()) { plic_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 );
@@ -465,9 +455,8 @@ static void create_fdt_socket_plic(RISCVVirtState *s,qemu_fdt_add_subnode (mc->fdt, plic_name);qemu_fdt_setprop_cell (mc->fdt, plic_name,"#interrupt-cells" ,FDT_PLIC_INT_CELLS ); -qemu_fdt_setprop_string_array (mc->fdt, plic_name,"compatible" , - (char **)&plic_compat, -ARRAY_SIZE (plic_compat)); +qemu_fdt_setprop_strings (mc->fdt, plic_name,"compatible" , +"sifive,plic-1.0.0" ,"riscv,plic0" );qemu_fdt_setprop (mc->fdt, plic_name,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop (mc->fdt, plic_name,"interrupts-extended" , plic_cells, s->soc[socket].num_harts *sizeof (uint32_t ) *4 );
@@ -881,13 +870,8 @@ static void create_fdt_reset(RISCVVirtState *s, const MemMapEntry *memmap, name =g_strdup_printf ("/soc/test@%lx" , (long )memmap[VIRT_TEST ].base);qemu_fdt_add_subnode (mc->fdt, name); - { -static const char *const compat[3 ] = { -"sifive,test1" ,"sifive,test0" ,"syscon" - }; -qemu_fdt_setprop_string_array (mc->fdt, name,"compatible" , - (char **)&compat,ARRAY_SIZE (compat)); - } +qemu_fdt_setprop_strings (mc->fdt, name,"compatible" , +"sifive,test1" ,"sifive,test0" ,"syscon" );qemu_fdt_setprop_cells (mc->fdt, name,"reg" ,0x0 , memmap[VIRT_TEST ].base,0x0 , memmap[VIRT_TEST ].size);qemu_fdt_setprop_cell (mc->fdt, name,"phandle" , test_phandle);
Signature · 1 line
2.35.1
PATCH v3 3/5 hw/core: use qemu_fdt_setprop_strings()
In reply to Ben DooksChange to using the qemu_fdt_setprop_strings() helper in hw/core code.
--- hw/core/guest-loader.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
hw/core/guest-loader.c +4 -8
@@ -56,10 +56,8 @@ static void loader_insert_platform_data(GuestLoaderState *s, int size,qemu_fdt_setprop (fdt, node,"reg" , ®_attr,sizeof (reg_attr));if (s->kernel) { -const char *compat[2 ] = {"multiboot,module" ,"multiboot,kernel" }; -if (qemu_fdt_setprop_string_array (fdt, node,"compatible" , - (char **) &compat, -ARRAY_SIZE (compat)) <0 ) { +if (qemu_fdt_setprop_strings (fdt, node,"compatible" , +"multiboot,module" ,"multiboot,kernel" ) <0 ) {error_setg (errp,"couldn't set %s/compatible" , node);return ; }
@@ -69,10 +67,8 @@ static void loader_insert_platform_data(GuestLoaderState *s, int size, } } }else if (s->initrd) { -const char *compat[2 ] = {"multiboot,module" ,"multiboot,ramdisk" }; -if (qemu_fdt_setprop_string_array (fdt, node,"compatible" , - (char **) &compat, -ARRAY_SIZE (compat)) <0 ) { +if (qemu_fdt_setprop_strings (fdt, node,"compatible" , +"multiboot,module" ,"multiboot,ramdisk" ) <0 ) {error_setg (errp,"couldn't set %s/compatible" , node);return ; }
Signature · 1 line
2.35.1
Re: [PATCH v3 3/5] hw/core: use qemu_fdt_setprop_strings()
Quoted 6 lines · Ben Dooks
Change to using the
qemu_fdt_setprop_strings()helper in hw/core code.Signed-off-by Ben Dooks <[email protected]>---
thanks
-- PMM
Re: [PATCH v3 3/5] hw/core: use qemu_fdt_setprop_strings()
Quoted 9 lines · Peter Maydell
Quoted 6 lines · Ben Dooks
Change to using the
qemu_fdt_setprop_strings()helper in hw/core code.Signed-off-by Ben Dooks <[email protected]>---
Reviewed-by Peter Maydell <[email protected]>
I've had to make a second version, so assuming it'll need reviewing again
Signature · 3 lines
Ben Dooks, [email protected], http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.
Re: [PATCH v3 3/5] hw/core: use qemu_fdt_setprop_strings()
Quoted 7 lines · Ben Dooks
Quoted 5 lines · Peter Maydell
Quoted 4 lines · Ben Dooks
Change to using the
qemu_fdt_setprop_strings()helper in hw/core code.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Ben Dooks <[email protected]>---
Reviewed-by Peter Maydell <[email protected]>I've had to make a second version, so assuming it'll need reviewing again
If you didn't change the specific patch that I gave a reviewed-by tag for, then you should put that tag into the commit message next to your signed-off-by line in the patch you send in the v2 series, to indicate it's already been reviewed and doesn't need re-doing in v2.
thanks
-- PMM
PATCH v3 4/5 hw/mips: use qemu_fdt_setprop_strings()
In reply to Ben DooksChange to using qemu_fdt_setprop_strings() helper in hw/mips.
--- hw/mips/boston.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
hw/mips/boston.c +2 -6
@@ -515,9 +515,6 @@ static const void *create_fdt(BostonState *s,MachineState *mc = s->mach;uint32_t platreg_ph, gic_ph, clk_ph;char *name, *gic_name, *platreg_name, *stdout_name; -static const char *const syscon_compat[2 ] = { -"img,boston-platform-regs" ,"syscon" - }; fdt =create_device_tree (dt_size);if (!fdt) {
@@ -608,9 +605,8 @@ static const void *create_fdt(BostonState *s, platreg_name =g_strdup_printf ("/soc/system-controller@%" HWADDR_PRIx, memmap[BOSTON_PLATREG ].base);qemu_fdt_add_subnode (fdt, platreg_name); -qemu_fdt_setprop_string_array (fdt, platreg_name,"compatible" , - (char **)&syscon_compat, -ARRAY_SIZE (syscon_compat)); +qemu_fdt_setprop_strings (fdt, platreg_name,"compatible" , +"img,boston-platform-regs" ,"syscon" );qemu_fdt_setprop_cells (fdt, platreg_name,"reg" , memmap[BOSTON_PLATREG ].base, memmap[BOSTON_PLATREG ].size);
Signature · 1 line
2.35.1
Re: [PATCH v3 4/5] hw/mips: use qemu_fdt_setprop_strings()
Quoted 5 lines · Ben Dooks
Change to using
qemu_fdt_setprop_strings()helper in hw/mips.Signed-off-by Ben Dooks <[email protected]>---
thanks
-- PMM
PATCH v3 5/5 hw/arm: change to use qemu_fdt_setprop_strings()
In reply to Ben DooksChange to using qemu_fdt_setprop_strings() instead of using \0 separated string arrays.
--- hw/arm/boot.c | 8 +++--- hw/arm/virt.c | 28 +++++++++------------ hw/arm/xlnx-versal-virt.c | 51 ++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 50 deletions(-)
hw/arm/boot.c +4 -4
@@ -490,11 +490,11 @@ static void fdt_add_psci_node(void *fdt)qemu_fdt_add_subnode (fdt,"/psci" );if (armcpu->psci_version >=QEMU_PSCI_VERSION_0_2 ) {if (armcpu->psci_version <QEMU_PSCI_VERSION_1_0 ) { -const char comp[] ="arm,psci-0.2\0arm,psci" ; -qemu_fdt_setprop (fdt,"/psci" ,"compatible" , comp,sizeof (comp)); +qemu_fdt_setprop_strings (fdt,"/psci" ,"compatible" , +"arm,psci-0.2" ,"arm,psci" ); }else { -const char comp[] ="arm,psci-1.0\0arm,psci-0.2\0arm,psci" ; -qemu_fdt_setprop (fdt,"/psci" ,"compatible" , comp,sizeof (comp)); +qemu_fdt_setprop_strings (fdt,"/psci" ,"compatible" , +"arm,psci-1.0" ,"arm,psci-0.2" ,"arm,psci" ); } cpu_off_fn =QEMU_PSCI_0_2_FN_CPU_OFF ;
hw/arm/virt.c +12 -16
@@ -343,9 +343,8 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms) armcpu =ARM_CPU (qemu_get_cpu (0 ));if (arm_feature (&armcpu->env,ARM_FEATURE_V8 )) { -const char compat[] ="arm,armv8-timer\0arm,armv7-timer" ; -qemu_fdt_setprop (ms->fdt,"/timer" ,"compatible" , - compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt,"/timer" ,"compatible" , +"arm,armv8-timer" ,"arm,armv7-timer" ); }else {qemu_fdt_setprop_string (ms->fdt,"/timer" ,"compatible" ,"arm,armv7-timer" );
@@ -843,8 +842,6 @@ static void create_uart(const VirtMachineState *vms, int uart,hwaddr base = vms->memmap[uart].base;hwaddr size = vms->memmap[uart].size;int irq = vms->irqmap[uart]; -const char compat[] ="arm,pl011\0arm,primecell" ; -const char clocknames[] ="uartclk\0apb_pclk" ;DeviceState *dev =qdev_new (TYPE_PL011 );SysBusDevice *s =SYS_BUS_DEVICE (dev);MachineState *ms =MACHINE (vms);
@@ -858,8 +855,8 @@ static void create_uart(const VirtMachineState *vms, int uart, nodename =g_strdup_printf ("/pl011@%" PRIx64, base);qemu_fdt_add_subnode (ms->fdt, nodename);/* Note that we can't use setprop_string because of the embedded NUL */ -qemu_fdt_setprop (ms->fdt, nodename,"compatible" , - compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"compatible" , +"arm,pl011" ,"arm,primecell" );qemu_fdt_setprop_sized_cells (ms->fdt, nodename,"reg" ,2 , base,2 , size); qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
@@ -867,8 +864,8 @@ static void create_uart(const VirtMachineState *vms, int uart, GIC_FDT_IRQ_FLAGS_LEVEL_HI);qemu_fdt_setprop_cells (ms->fdt, nodename,"clocks" , vms->clock_phandle, vms->clock_phandle); -qemu_fdt_setprop (ms->fdt, nodename,"clock-names" , - clocknames,sizeof (clocknames)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"clock-names" , +"uartclk" ,"apb_pclk" );if (uart ==VIRT_UART ) {qemu_fdt_setprop_string (ms->fdt,"/chosen" ,"stdout-path" , nodename);
@@ -890,14 +887,14 @@ static void create_rtc(const VirtMachineState *vms)hwaddr base = vms->memmap[VIRT_RTC ].base;hwaddr size = vms->memmap[VIRT_RTC ].size;int irq = vms->irqmap[VIRT_RTC ]; -const char compat[] ="arm,pl031\0arm,primecell" ;MachineState *ms =MACHINE (vms);sysbus_create_simple ("pl031" , base,qdev_get_gpio_in (vms->gic, irq)); nodename =g_strdup_printf ("/pl031@%" PRIx64, base);qemu_fdt_add_subnode (ms->fdt, nodename); -qemu_fdt_setprop (ms->fdt, nodename,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"compatible" , +"arm,pl031" ,"arm,primecell" );qemu_fdt_setprop_sized_cells (ms->fdt, nodename,"reg" ,2 , base,2 , size); qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
@@ -983,7 +980,6 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio,hwaddr base = vms->memmap[gpio].base;hwaddr size = vms->memmap[gpio].size;int irq = vms->irqmap[gpio]; -const char compat[] ="arm,pl061\0arm,primecell" ;SysBusDevice *s;MachineState *ms =MACHINE (vms);
@@ -1001,7 +997,8 @@ static void create_gpio_devices(const VirtMachineState *vms, int gpio,qemu_fdt_add_subnode (ms->fdt, nodename);qemu_fdt_setprop_sized_cells (ms->fdt, nodename,"reg" ,2 , base,2 , size); -qemu_fdt_setprop (ms->fdt, nodename,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"compatible" , +"arm,pl061" ,"arm,primecell" );qemu_fdt_setprop_cell (ms->fdt, nodename,"#gpio-cells" ,2 );qemu_fdt_setprop (ms->fdt, nodename,"gpio-controller" ,NULL ,0 ); qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
@@ -1325,7 +1322,6 @@ static void create_smmu(const VirtMachineState *vms,int i;hwaddr base = vms->memmap[VIRT_SMMU ].base;hwaddr size = vms->memmap[VIRT_SMMU ].size; -const char irq_names[] ="eventq\0priq\0cmdq-sync\0gerror" ;DeviceState *dev;MachineState *ms =MACHINE (vms);
@@ -1355,8 +1351,8 @@ static void create_smmu(const VirtMachineState *vms,GIC_FDT_IRQ_TYPE_SPI , irq +2 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , GIC_FDT_IRQ_TYPE_SPI, irq + 3, GIC_FDT_IRQ_FLAGS_EDGE_LO_HI); -qemu_fdt_setprop (ms->fdt, node,"interrupt-names" , irq_names, -sizeof (irq_names)); +qemu_fdt_setprop_strings (ms->fdt, node,"interrupt-names" , +"eventq" ,"priq" ,"cmdq-sync" ,"gerror" );qemu_fdt_setprop_cell (ms->fdt, node,"clocks" , vms->clock_phandle);qemu_fdt_setprop_string (ms->fdt, node,"clock-names" ,"apb_pclk" );
hw/arm/xlnx-versal-virt.c +21 -30
147 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH v3 5/5] hw/arm: change to use qemu_fdt_setprop_strings()
Quoted 16 lines · Ben Dooks
Change to using
qemu_fdt_setprop_strings()instead of using \0 separated string arrays.Signed-off-by Ben Dooks <[email protected]>--- hw/arm/boot.c | 8 +++--- hw/arm/virt.c | 28 +++++++++------------ hw/arm/xlnx-versal-virt.c | 51 ++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 50 deletions(-)hw/arm/boot.c +0
-0
hw/arm/boot.c static void fdt_add_psci_node(void *fdt) · line 494
Quoted 7 lines
hw/arm/boot.c +2
-2@@ -490,11 +490,11 @@ static void fdt_add_psci_node(void *fdt)qemu_fdt_add_subnode (fdt,"/psci" );if (armcpu->psci_version >=QEMU_PSCI_VERSION_0_2 ) {if (armcpu->psci_version <QEMU_PSCI_VERSION_1_0 ) { -const char comp[] ="arm,psci-0.2\0arm,psci" ; -qemu_fdt_setprop (fdt,"/psci" ,"compatible" , comp,sizeof (comp)); +qemu_fdt_setprop_strings (fdt,"/psci" ,"compatible" , +"arm,psci-0.2" ,"arm,psci" );
I think you may have some stray trailing whitespace here. checkpatch should be able to tell you.
hw/arm/boot.c static void create_uart(const VirtMachineState *vms, int uart, · line 857
Quoted 4 lines
hw/arm/boot.c +0
-0@@ -858,8 +855,8 @@ static void create_uart(const VirtMachineState *vms, int uart, nodename =g_strdup_printf ("/pl011@%" PRIx64, base);qemu_fdt_add_subnode (ms->fdt, nodename);/* Note that we can't use setprop_string because of the embedded NUL */
With this change, this comment becomes obsolete, and we should delete it too.
Quoted 11 lines
hw/arm/boot.c +2
-2-qemu_fdt_setprop (ms->fdt, nodename,"compatible" , - compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"compatible" , +"arm,pl011" ,"arm,primecell" );qemu_fdt_setprop_sized_cells (ms->fdt, nodename,"reg" ,2 , base,2 , size); qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",
hw/arm/boot.c static void fdt_add_gem_nodes(VersalVirt *s) · line 289
Quoted 5 lines
hw/arm/boot.c +0
-2@@ -285,8 +280,6 @@ static void fdt_add_gem_nodes(VersalVirt *s)static void fdt_add_zdma_nodes (VersalVirt *s) { -const char clocknames[] ="clk_main\0clk_apb" ; -const char compat[] ="xlnx,zynqmp-dma-1.0" ;
This looks suspiciously like a pre-existing bug to me. Alaistair, Edgar -- shouldn't this be a NUL-separated 'compatible' string, rather than a comma-separated one?
Quoted 17 lines
hw/arm/boot.c +2
-3int i;for (i =XLNX_VERSAL_NR_ADMAS -1 ; i >=0 ; i--) {@@ -298,22 +291,21 @@ static void fdt_add_zdma_nodes(VersalVirt *s)qemu_fdt_setprop_cell (s->fdt, name,"xlnx,bus-width" ,64 );qemu_fdt_setprop_cells (s->fdt, name,"clocks" , s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); -qemu_fdt_setprop (s->fdt, name,"clock-names" , - clocknames,sizeof (clocknames)); +qemu_fdt_setprop_strings (s->fdt, name,"clock-names" , +"clk_main" ,"clk_apb" );qemu_fdt_setprop_cells (s->fdt, name,"interrupts" ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_ADMA_IRQ_0 + i,GIC_FDT_IRQ_FLAGS_LEVEL_HI );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 , addr,2 ,0x1000 ); -qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat));
hw/arm/boot.c static void fdt_add_zdma_nodes(VersalVirt *s) · line 316
Quoted 10 lines
hw/arm/boot.c +2
-2+qemu_fdt_setprop_string (s->fdt, name,"compatible" , +"xlnx,zynqmp-dma-1.0" );g_free (name); } }static void fdt_add_sd_nodes (VersalVirt *s) { -const char clocknames[] ="clk_xin\0clk_ahb" ; -const char compat[] ="arasan,sdhci-8.9a" ;
Ditto here...
Quoted 16 lines
hw/arm/boot.c +2
-2int i;for (i =ARRAY_SIZE (s->soc.pmc.iou.sd) -1 ; i >=0 ; i--) {@@ -324,22 +316,21 @@ static void fdt_add_sd_nodes(VersalVirt *s)qemu_fdt_setprop_cells (s->fdt, name,"clocks" , s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); -qemu_fdt_setprop (s->fdt, name,"clock-names" , - clocknames,sizeof (clocknames)); +qemu_fdt_setprop_strings (s->fdt, name,"clock-names" , +"clk_xin" ,"clk_ahb" );qemu_fdt_setprop_cells (s->fdt, name,"interrupts" ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_SD0_IRQ_0 + i *2 ,GIC_FDT_IRQ_FLAGS_LEVEL_HI );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 , addr,2 ,MM_PMC_SD0_SIZE );
hw/arm/boot.c static void fdt_add_sd_nodes(VersalVirt *s) · line 341
Quoted 10 lines
hw/arm/boot.c +2
-2-qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_string (s->fdt, name,"compatible" , +"arasan,sdhci-8.9a" );g_free (name); } }static void fdt_add_rtc_node (VersalVirt *s) { -const char compat[] ="xlnx,zynqmp-rtc" ;
...and here.
Quoted 8 lines
hw/arm/boot.c +0
-1-const char interrupt_names[] ="alarm\0sec" ;char *name =g_strdup_printf ("/rtc@%x" ,MM_PMC_RTC );qemu_fdt_add_subnode (s->fdt, name);@@ -349,11 +340,11 @@ static void fdt_add_rtc_node(VersalVirt *s)GIC_FDT_IRQ_FLAGS_LEVEL_HI ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_RTC_SECONDS_IRQ , GIC_FDT_IRQ_FLAGS_LEVEL_HI);
hw/arm/boot.c static void fdt_add_rtc_node(VersalVirt *s) · line 349
Quoted 10 lines
hw/arm/boot.c +3
-3-qemu_fdt_setprop (s->fdt, name,"interrupt-names" , - interrupt_names,sizeof (interrupt_names)); +qemu_fdt_setprop_strings (s->fdt, name,"interrupt-names" , +"alarm" ,"sec" );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 ,MM_PMC_RTC ,2 ,MM_PMC_RTC_SIZE ); -qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_string (s->fdt, name,"compatible" ,"xlnx,zynqmp-rtc" );g_free (name); }
thanks
-- PMM
Re: [PATCH v3 5/5] hw/arm: change to use qemu_fdt_setprop_strings()
Quoted 12 lines · Peter Maydell
Quoted 11 lines · Ben Dooks
Change to using
qemu_fdt_setprop_strings()instead of using \0 separated string arrays.Signed-off-by Ben Dooks <[email protected]>--- hw/arm/boot.c | 8 +++--- hw/arm/virt.c | 28 +++++++++------------ hw/arm/xlnx-versal-virt.c | 51 ++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 50 deletions(-)
Quoted 15 lines
hw/arm/boot.c static void fdt_add_psci_node(void *fdt) · line 494
Quoted 12 lines
hw/arm/boot.c +2
-2@@ -490,11 +490,11 @@ static void fdt_add_psci_node(void *fdt)qemu_fdt_add_subnode (fdt,"/psci" );if (armcpu->psci_version >=QEMU_PSCI_VERSION_0_2 ) {if (armcpu->psci_version <QEMU_PSCI_VERSION_1_0 ) { -const char comp[] ="arm,psci-0.2\0arm,psci" ; -qemu_fdt_setprop (fdt,"/psci" ,"compatible" , comp,sizeof (comp)); +qemu_fdt_setprop_strings (fdt,"/psci" ,"compatible" , +"arm,psci-0.2" ,"arm,psci" );I think you may have some stray trailing whitespace here. checkpatch should be able to tell you.
ok, will check
Quoted 19 lines
hw/arm/boot.c static void create_uart(const VirtMachineState *vms, int uart, · line 857
Quoted 4 lines
hw/arm/boot.c +0
-0@@ -858,8 +855,8 @@ static void create_uart(const VirtMachineState *vms, int uart, nodename =g_strdup_printf ("/pl011@%" PRIx64, base);qemu_fdt_add_subnode (ms->fdt, nodename);/* Note that we can't use setprop_string because of the embedded NUL */ With this change, this comment becomes obsolete, and we should delete it too.
Quoted 12 lines
hw/arm/boot.c +2
-2-qemu_fdt_setprop (ms->fdt, nodename,"compatible" , - compat,sizeof (compat)); +qemu_fdt_setprop_strings (ms->fdt, nodename,"compatible" , +"arm,pl011" ,"arm,primecell" );qemu_fdt_setprop_sized_cells (ms->fdt, nodename,"reg" ,2 , base,2 , size); qemu_fdt_setprop_cells(ms->fdt, nodename, "interrupts",@@ -285,8 +280,6 @@ static void fdt_add_gem_nodes(VersalVirt *s)
Quoted 8 lines
hw/arm/boot.c static void fdt_add_gem_nodes(VersalVirt *s) · line 289
Quoted 4 lines
hw/arm/boot.c +0
-2static void fdt_add_zdma_nodes (VersalVirt *s) { -const char clocknames[] ="clk_main\0clk_apb" ; -const char compat[] ="xlnx,zynqmp-dma-1.0" ;This looks suspiciously like a pre-existing bug to me. Alaistair, Edgar -- shouldn't this be a NUL-separated 'compatible' string, rather than a comma-separated one?
I think the compat[] is fine, I should have probably added I also fixed up to just call qemu_fdt_setprop_string()
Quoted 81 lines
Quoted 17 lines
hw/arm/boot.c +2
-3int i;for (i =XLNX_VERSAL_NR_ADMAS -1 ; i >=0 ; i--) {@@ -298,22 +291,21 @@ static void fdt_add_zdma_nodes(VersalVirt *s)qemu_fdt_setprop_cell (s->fdt, name,"xlnx,bus-width" ,64 );qemu_fdt_setprop_cells (s->fdt, name,"clocks" , s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); -qemu_fdt_setprop (s->fdt, name,"clock-names" , - clocknames,sizeof (clocknames)); +qemu_fdt_setprop_strings (s->fdt, name,"clock-names" , +"clk_main" ,"clk_apb" );qemu_fdt_setprop_cells (s->fdt, name,"interrupts" ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_ADMA_IRQ_0 + i,GIC_FDT_IRQ_FLAGS_LEVEL_HI );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 , addr,2 ,0x1000 ); -qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat));hw/arm/boot.c static void fdt_add_zdma_nodes(VersalVirt *s) · line 316
Quoted 10 lines
hw/arm/boot.c +2
-2+qemu_fdt_setprop_string (s->fdt, name,"compatible" , +"xlnx,zynqmp-dma-1.0" );g_free (name); } }static void fdt_add_sd_nodes (VersalVirt *s) { -const char clocknames[] ="clk_xin\0clk_ahb" ; -const char compat[] ="arasan,sdhci-8.9a" ;Ditto here...
Quoted 16 lines
hw/arm/boot.c +2
-2int i;for (i =ARRAY_SIZE (s->soc.pmc.iou.sd) -1 ; i >=0 ; i--) {@@ -324,22 +316,21 @@ static void fdt_add_sd_nodes(VersalVirt *s)qemu_fdt_setprop_cells (s->fdt, name,"clocks" , s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); -qemu_fdt_setprop (s->fdt, name,"clock-names" , - clocknames,sizeof (clocknames)); +qemu_fdt_setprop_strings (s->fdt, name,"clock-names" , +"clk_xin" ,"clk_ahb" );qemu_fdt_setprop_cells (s->fdt, name,"interrupts" ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_SD0_IRQ_0 + i *2 ,GIC_FDT_IRQ_FLAGS_LEVEL_HI );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 , addr,2 ,MM_PMC_SD0_SIZE );hw/arm/boot.c static void fdt_add_sd_nodes(VersalVirt *s) · line 341
Quoted 10 lines
hw/arm/boot.c +2
-2-qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_string (s->fdt, name,"compatible" , +"arasan,sdhci-8.9a" );g_free (name); } }static void fdt_add_rtc_node (VersalVirt *s) { -const char compat[] ="xlnx,zynqmp-rtc" ;...and here.
Quoted 8 lines
hw/arm/boot.c +0
-1-const char interrupt_names[] ="alarm\0sec" ;char *name =g_strdup_printf ("/rtc@%x" ,MM_PMC_RTC );qemu_fdt_add_subnode (s->fdt, name);@@ -349,11 +340,11 @@ static void fdt_add_rtc_node(VersalVirt *s)GIC_FDT_IRQ_FLAGS_LEVEL_HI ,GIC_FDT_IRQ_TYPE_SPI ,VERSAL_RTC_SECONDS_IRQ , GIC_FDT_IRQ_FLAGS_LEVEL_HI);hw/arm/boot.c static void fdt_add_rtc_node(VersalVirt *s) · line 349
Quoted 10 lines
hw/arm/boot.c +3
-3-qemu_fdt_setprop (s->fdt, name,"interrupt-names" , - interrupt_names,sizeof (interrupt_names)); +qemu_fdt_setprop_strings (s->fdt, name,"interrupt-names" , +"alarm" ,"sec" );qemu_fdt_setprop_sized_cells (s->fdt, name,"reg" ,2 ,MM_PMC_RTC ,2 ,MM_PMC_RTC_SIZE ); -qemu_fdt_setprop (s->fdt, name,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_string (s->fdt, name,"compatible" ,"xlnx,zynqmp-rtc" );g_free (name); }thanks
-- PMM
Signature · 3 lines
Ben Dooks, [email protected], http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.
Re: [PATCH v3 5/5] hw/arm: change to use qemu_fdt_setprop_strings()
Quoted 14 lines · Ben Dooks
Quoted 11 lines · Peter Maydell
hw/arm/xlnx-versal-virt.c static void fdt_add_gem_nodes(VersalVirt *s) · line 289
Quoted 6 lines · Ben Dooks
hw/arm/xlnx-versal-virt.c +0
-2@@ -285,8 +280,6 @@ static void fdt_add_gem_nodes(VersalVirt *s)static void fdt_add_zdma_nodes (VersalVirt *s) { -const char clocknames[] ="clk_main\0clk_apb" ; -const char compat[] ="xlnx,zynqmp-dma-1.0" ;This looks suspiciously like a pre-existing bug to me. Alaistair, Edgar -- shouldn't this be a NUL-separated 'compatible' string, rather than a comma-separated one?
Quoted 2 lines
I think the compat[] is fine, I should have probably added I also fixed up to just call
qemu_fdt_setprop_string()
I guess if it's definitely supposed to be one string instead of two that's OK.
-- PMM
Re: [PATCH v3 5/5] hw/arm: change to use qemu_fdt_setprop_strings()
Quoted 15 lines · Peter Maydell
Quoted 14 lines · Ben Dooks
Quoted 11 lines · Peter Maydell
hw/arm/xlnx-versal-virt.c static void fdt_add_gem_nodes(VersalVirt *s) · line 289
Quoted 6 lines · Ben Dooks
hw/arm/xlnx-versal-virt.c +0
-2@@ -285,8 +280,6 @@ static void fdt_add_gem_nodes(VersalVirt *s)static void fdt_add_zdma_nodes (VersalVirt *s) { -const char clocknames[] ="clk_main\0clk_apb" ; -const char compat[] ="xlnx,zynqmp-dma-1.0" ;This looks suspiciously like a pre-existing bug to me. Alaistair, Edgar -- shouldn't this be a NUL-separated 'compatible' string, rather than a comma-separated one?
Quoted 4 lines
Quoted 2 lines
I think the compat[] is fine, I should have probably added I also fixed up to just call
qemu_fdt_setprop_string()I guess if it's definitely supposed to be one string instead of two that's OK.
FWIW the compat strings look like they are using the older <manufacturer>,<device> notation similar to SUNW,tcx and SUNW,cgthree so if Xilinx is the manufacturer I think they are correct.
ATB,
Mark.
Quoted 7 lines · Ben Dooks
Add a helper for
qemu_fdt_setprop_strings()to take a set of strings to put into a device-tree, which removes several open-coded methods such as setting an char arr[] = {..} or setting char val[] = "str\0str2";This is for hw/arm, hw/mips and hw/riscv as well as a couple of cores. It is not fully tested over all of those, I may not have caught all places this is to be replaced.
I've added a branch at
https://github.com/bendooks/qemu.git dev/fdt-string-array
Signature · 3 lines
Ben Dooks, [email protected], http://www.fluff.org/ben/ Large Hadron Colada: A large Pina Colada that makes the universe disappear.