[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/12] hw/arm/vexpress: Use qdev_prop_set_array()
From: |
Kevin Wolf |
Subject: |
[PATCH v2 06/12] hw/arm/vexpress: Use qdev_prop_set_array() |
Date: |
Mon, 30 Oct 2023 15:26:52 +0100 |
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>
---
hw/arm/vexpress.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 8ff37f52ca..eb720f6de7 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -43,6 +43,7 @@
#include "hw/cpu/a15mpcore.h"
#include "hw/i2c/arm_sbcon_i2c.h"
#include "hw/sd/sd.h"
+#include "qapi/qmp/qlist.h"
#include "qom/object.h"
#include "audio/audio.h"
@@ -552,6 +553,7 @@ static void vexpress_common_init(MachineState *machine)
ram_addr_t vram_size, sram_size;
MemoryRegion *sysmem = get_system_memory();
const hwaddr *map = daughterboard->motherboard_map;
+ QList *db_voltage, *db_clock;
int i;
daughterboard->init(vms, machine->ram_size, machine->cpu_type, pic);
@@ -592,20 +594,19 @@ static void vexpress_common_init(MachineState *machine)
sysctl = qdev_new("realview_sysctl");
qdev_prop_set_uint32(sysctl, "sys_id", sys_id);
qdev_prop_set_uint32(sysctl, "proc_id", daughterboard->proc_id);
- qdev_prop_set_uint32(sysctl, "len-db-voltage",
- daughterboard->num_voltage_sensors);
+
+ db_voltage = qlist_new();
for (i = 0; i < daughterboard->num_voltage_sensors; i++) {
- char *propname = g_strdup_printf("db-voltage[%d]", i);
- qdev_prop_set_uint32(sysctl, propname, daughterboard->voltages[i]);
- g_free(propname);
+ qlist_append_int(db_voltage, daughterboard->voltages[i]);
}
- qdev_prop_set_uint32(sysctl, "len-db-clock",
- daughterboard->num_clocks);
+ qdev_prop_set_array(sysctl, "db-voltage", db_voltage);
+
+ db_clock = qlist_new();
for (i = 0; i < daughterboard->num_clocks; i++) {
- char *propname = g_strdup_printf("db-clock[%d]", i);
- qdev_prop_set_uint32(sysctl, propname, daughterboard->clocks[i]);
- g_free(propname);
+ qlist_append_int(db_clock, daughterboard->clocks[i]);
}
+ qdev_prop_set_array(sysctl, "db-clock", db_clock);
+
sysbus_realize_and_unref(SYS_BUS_DEVICE(sysctl), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, map[VE_SYSREGS]);
--
2.41.0
- [PATCH v2 03/12] hw/arm/mps2-tz: Use qdev_prop_set_array(), (continued)
- [PATCH v2 03/12] hw/arm/mps2-tz: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [PATCH v2 02/12] hw/i386/pc: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [PATCH v2 07/12] hw/arm/virt: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [PATCH v2 10/12] qom: Add object_property_set_default_list(), Kevin Wolf, 2023/10/30
- [PATCH v2 11/12] qdev: Make netdev properties work as list elements, Kevin Wolf, 2023/10/30
- [PATCH v2 09/12] hw/rx/rx62n: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [PATCH v2 05/12] hw/arm/sbsa-ref: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [PATCH v2 12/12] qdev: Rework array properties based on list visitor, Kevin Wolf, 2023/10/30
- [PATCH v2 06/12] hw/arm/vexpress: Use qdev_prop_set_array(),
Kevin Wolf <=
- [PATCH v2 08/12] hw/arm/xlnx-versal: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30