motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 01:21:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/arm/vexpress: 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>
Message-ID: <20231109174240.72376-6-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-11-09 18:42:34 +01:00
parent d210fa2f05
commit 50ab8648c0
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
hw/arm/vexpress.c
View file

@ -43,6 +43,7 @@
#include "hw/cpu/a15mpcore.h" #include "hw/cpu/a15mpcore.h"
#include "hw/i2c/arm_sbcon_i2c.h" #include "hw/i2c/arm_sbcon_i2c.h"
#include "hw/sd/sd.h" #include "hw/sd/sd.h"
#include "qapi/qmp/qlist.h"
#include "qom/object.h" #include "qom/object.h"
#include "audio/audio.h" #include "audio/audio.h"
@ -544,6 +545,7 @@ static void vexpress_common_init(MachineState *machine)
ram_addr_t vram_size, sram_size; ram_addr_t vram_size, sram_size;
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
const hwaddr *map = daughterboard->motherboard_map; const hwaddr *map = daughterboard->motherboard_map;
QList *db_voltage, *db_clock;
int i; int i;
daughterboard->init(vms, machine->ram_size, machine->cpu_type, pic); daughterboard->init(vms, machine->ram_size, machine->cpu_type, pic);
@ -584,20 +586,19 @@ static void vexpress_common_init(MachineState *machine)
sysctl = qdev_new("realview_sysctl"); sysctl = qdev_new("realview_sysctl");
qdev_prop_set_uint32(sysctl, "sys_id", sys_id); qdev_prop_set_uint32(sysctl, "sys_id", sys_id);
qdev_prop_set_uint32(sysctl, "proc_id", daughterboard->proc_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++) { for (i = 0; i < daughterboard->num_voltage_sensors; i++) {
char *propname = g_strdup_printf("db-voltage[%d]", i); qlist_append_int(db_voltage, daughterboard->voltages[i]);
qdev_prop_set_uint32(sysctl, propname, daughterboard->voltages[i]);
g_free(propname);
} }
qdev_prop_set_uint32(sysctl, "len-db-clock", qdev_prop_set_array(sysctl, "db-voltage", db_voltage);
daughterboard->num_clocks);
db_clock = qlist_new();
for (i = 0; i < daughterboard->num_clocks; i++) { for (i = 0; i < daughterboard->num_clocks; i++) {
char *propname = g_strdup_printf("db-clock[%d]", i); qlist_append_int(db_clock, daughterboard->clocks[i]);
qdev_prop_set_uint32(sysctl, propname, daughterboard->clocks[i]);
g_free(propname);
} }
qdev_prop_set_array(sysctl, "db-clock", db_clock);
sysbus_realize_and_unref(SYS_BUS_DEVICE(sysctl), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(sysctl), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, map[VE_SYSREGS]); sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, map[VE_SYSREGS]);