Re: [PATCH 09/11] hw/rx/rx62n: Use qdev_prop_set_array()

[Markus Armbruster]

Kevin Wolf  writes:

> Instead of manually setting "foo-len" and "foo[i]" properties, build a
> QList and use the new qdev_prop_set_array() helper to set the whole
> array property with a single call.
>
> Signed-off-by: Kevin Wolf 
> ---
>  hw/rx/rx62n.c | 19 ++-
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
> index 3e887a0fc7..6990096642 100644
> --- a/hw/rx/rx62n.c
> +++ b/hw/rx/rx62n.c
> @@ -28,6 +28,7 @@
>  #include "hw/sysbus.h"
>  #include "hw/qdev-properties.h"
>  #include "sysemu/sysemu.h"
> +#include "qapi/qmp/qlist.h"
>  #include "qom/object.h"
>  
>  /*
> @@ -130,22 +131,22 @@ static void register_icu(RX62NState *s)
>  {
>  int i;
>  SysBusDevice *icu;
> +QList *ipr_map, *trigger_level;
>  
>  object_initialize_child(OBJECT(s), "icu", >icu, TYPE_RX_ICU);
>  icu = SYS_BUS_DEVICE(>icu);
> -qdev_prop_set_uint32(DEVICE(icu), "len-ipr-map", NR_IRQS);
> +
> +ipr_map = qlist_new();
>  for (i = 0; i < NR_IRQS; i++) {
> -char propname[32];
> -snprintf(propname, sizeof(propname), "ipr-map[%d]", i);
> -qdev_prop_set_uint32(DEVICE(icu), propname, ipr_table[i]);
> +qlist_append_int(ipr_map, ipr_table[i]);
>  }
> -qdev_prop_set_uint32(DEVICE(icu), "len-trigger-level",
> - ARRAY_SIZE(levelirq));
> +qdev_prop_set_array(sysctl, "ipr-map", ipr_map);

../hw/rx/rx62n.c:143:25: error: ‘sysctl’ undeclared (first use in this 
function); did you mean ‘syscall’?

Should be DEVICE(icu), I guess.

> +
> +trigger_level = qlist_new();
>  for (i = 0; i < ARRAY_SIZE(levelirq); i++) {
> -char propname[32];
> -snprintf(propname, sizeof(propname), "trigger-level[%d]", i);
> -qdev_prop_set_uint32(DEVICE(icu), propname, levelirq[i]);
> +qlist_append_int(trigger_level, levelirq[i]);
>  }
> +qdev_prop_set_array(sysctl, "trigger-level", trigger_level);

Again.

>  
>  for (i = 0; i < NR_IRQS; i++) {
>  s->irq[i] = qdev_get_gpio_in(DEVICE(icu), i);

Re: [PATCH 09/11] hw/rx/rx62n: Use qdev_prop_set_array()

[Philippe Mathieu-Daudé]

On 8/9/23 16:37, Kevin Wolf wrote:

Instead of manually setting "foo-len" and "foo[i]" properties, build a
QList and use the new qdev_prop_set_array() helper to set the whole
array property with a single call.

Signed-off-by: Kevin Wolf 
---
  hw/rx/rx62n.c | 19 ++-
  1 file changed, 10 insertions(+), 9 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

Re: [PATCH 09/11] hw/rx/rx62n: Use qdev_prop_set_array()

[Peter Maydell]

On Fri, 8 Sept 2023 at 15:37, Kevin Wolf  wrote:
>
> Instead of manually setting "foo-len" and "foo[i]" properties, build a
> QList and use the new qdev_prop_set_array() helper to set the whole
> array property with a single call.
>
> Signed-off-by: Kevin Wolf 
> ---
>  hw/rx/rx62n.c | 19 ++-

Reviewed-by: Peter Maydell 

thanks
-- PMM

[PATCH 09/11] hw/rx/rx62n: Use qdev_prop_set_array()

[Kevin Wolf]

Instead of manually setting "foo-len" and "foo[i]" properties, build a
QList and use the new qdev_prop_set_array() helper to set the whole
array property with a single call.

Signed-off-by: Kevin Wolf 
---
 hw/rx/rx62n.c | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 3e887a0fc7..6990096642 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -28,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
+#include "qapi/qmp/qlist.h"
 #include "qom/object.h"
 
 /*
@@ -130,22 +131,22 @@ static void register_icu(RX62NState *s)
 {
 int i;
 SysBusDevice *icu;
+QList *ipr_map, *trigger_level;
 
 object_initialize_child(OBJECT(s), "icu", >icu, TYPE_RX_ICU);
 icu = SYS_BUS_DEVICE(>icu);
-qdev_prop_set_uint32(DEVICE(icu), "len-ipr-map", NR_IRQS);
+
+ipr_map = qlist_new();
 for (i = 0; i < NR_IRQS; i++) {
-char propname[32];
-snprintf(propname, sizeof(propname), "ipr-map[%d]", i);
-qdev_prop_set_uint32(DEVICE(icu), propname, ipr_table[i]);
+qlist_append_int(ipr_map, ipr_table[i]);
 }
-qdev_prop_set_uint32(DEVICE(icu), "len-trigger-level",
- ARRAY_SIZE(levelirq));
+qdev_prop_set_array(sysctl, "ipr-map", ipr_map);
+
+trigger_level = qlist_new();
 for (i = 0; i < ARRAY_SIZE(levelirq); i++) {
-char propname[32];
-snprintf(propname, sizeof(propname), "trigger-level[%d]", i);
-qdev_prop_set_uint32(DEVICE(icu), propname, levelirq[i]);
+qlist_append_int(trigger_level, levelirq[i]);
 }
+qdev_prop_set_array(sysctl, "trigger-level", trigger_level);
 
 for (i = 0; i < NR_IRQS; i++) {
 s->irq[i] = qdev_get_gpio_in(DEVICE(icu), i);
-- 
2.41.0