mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/rx/rx62n: Use qdev_prop_set_array()

Browse Source 
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 <kwolf@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231109174240.72376-9-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-11-09 18:42:37 +01:00
parent 2394c782a9
commit 670581f932
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/rx/rx62n.c
View File

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