From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, armbru@redhat.com, berrange@redhat.com,
peter.maydell@linaro.org, pbonzini@redhat.com
Subject: [PATCH 04/11] hw/arm/mps2: Use qdev_prop_set_array()
Date: Fri, 8 Sep 2023 16:36:55 +0200 [thread overview]
Message-ID: <20230908143703.172758-5-kwolf@redhat.com> (raw)
In-Reply-To: <20230908143703.172758-1-kwolf@redhat.com>
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>
---
hw/arm/mps2.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index d92fd60684..292a180ad2 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -48,6 +48,7 @@
#include "net/net.h"
#include "hw/watchdog/cmsdk-apb-watchdog.h"
#include "hw/qdev-clock.h"
+#include "qapi/qmp/qlist.h"
#include "qom/object.h"
typedef enum MPS2FPGAType {
@@ -138,6 +139,7 @@ static void mps2_common_init(MachineState *machine)
MemoryRegion *system_memory = get_system_memory();
MachineClass *mc = MACHINE_GET_CLASS(machine);
DeviceState *armv7m, *sccdev;
+ QList *oscclk;
int i;
if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
@@ -402,10 +404,12 @@ static void mps2_common_init(MachineState *machine)
qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008);
qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id);
/* All these FPGA images have the same OSCCLK configuration */
- qdev_prop_set_uint32(sccdev, "len-oscclk", 3);
- qdev_prop_set_uint32(sccdev, "oscclk[0]", 50000000);
- qdev_prop_set_uint32(sccdev, "oscclk[1]", 24576000);
- qdev_prop_set_uint32(sccdev, "oscclk[2]", 25000000);
+ oscclk = qlist_new();
+ qlist_append_int(oscclk, 50000000);
+ qlist_append_int(oscclk, 24576000);
+ qlist_append_int(oscclk, 25000000);
+ qdev_prop_set_array(sccdev, "oscclk", oscclk);
+
sysbus_realize(SYS_BUS_DEVICE(&mms->scc), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(sccdev), 0, 0x4002f000);
object_initialize_child(OBJECT(mms), "fpgaio",
--
2.41.0
next prev parent reply other threads:[~2023-09-08 14:39 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 14:36 [PATCH 00/11] qdev: Make array properties user accessible again Kevin Wolf
2023-09-08 14:36 ` [PATCH 01/11] qdev: Add qdev_prop_set_array() Kevin Wolf
2023-09-11 15:41 ` Peter Maydell
2023-09-11 20:54 ` Philippe Mathieu-Daudé
2023-09-22 14:25 ` Markus Armbruster
2023-10-27 18:06 ` Peter Maydell
2023-10-30 11:29 ` Kevin Wolf
2023-09-08 14:36 ` [PATCH 02/11] hw/i386/pc: Use qdev_prop_set_array() Kevin Wolf
2023-09-11 15:42 ` Peter Maydell
2023-09-11 16:42 ` Kevin Wolf
2023-09-12 9:17 ` Peter Maydell
2023-09-19 8:35 ` Markus Armbruster
2023-09-08 14:36 ` [PATCH 03/11] hw/arm/mps2-tz: " Kevin Wolf
2023-09-11 15:43 ` Peter Maydell
2023-09-08 14:36 ` Kevin Wolf [this message]
2023-09-11 15:44 ` [PATCH 04/11] hw/arm/mps2: " Peter Maydell
2023-09-08 14:36 ` [PATCH 05/11] hw/arm/sbsa-ref: " Kevin Wolf
2023-09-11 15:44 ` Peter Maydell
2023-09-08 14:36 ` [PATCH 06/11] hw/arm/vexpress: " Kevin Wolf
2023-09-11 15:44 ` Peter Maydell
2023-09-08 14:36 ` [PATCH 07/11] hw/arm/virt: " Kevin Wolf
2023-09-11 15:48 ` Peter Maydell
2023-09-08 14:36 ` [PATCH 08/11] hw/arm/xlnx-versal: " Kevin Wolf
2023-09-11 15:49 ` Peter Maydell
2023-09-08 14:37 ` [PATCH 09/11] hw/rx/rx62n: " Kevin Wolf
2023-09-11 15:50 ` Peter Maydell
2023-09-11 20:52 ` Philippe Mathieu-Daudé
2023-09-22 13:59 ` Markus Armbruster
2023-09-08 14:37 ` [PATCH 10/11] qom: Add object_property_set_default_list() Kevin Wolf
2023-09-11 15:52 ` Peter Maydell
2023-09-08 14:37 ` [PATCH 11/11] qdev: Rework array properties based on list visitor Kevin Wolf
2023-09-08 15:18 ` Peter Maydell
2023-09-08 17:33 ` Kevin Wolf
2023-09-14 10:24 ` Peter Maydell
2023-09-14 11:58 ` Kevin Wolf
2023-09-22 15:05 ` Markus Armbruster
2023-10-13 17:03 ` Kevin Wolf
2023-10-14 6:36 ` Markus Armbruster
2023-10-16 12:34 ` Kevin Wolf
2023-10-23 11:41 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230908143703.172758-5-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).