[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/12] qdev: Add qdev_prop_set_array()
|
From: |
Kevin Wolf |
|
Subject: |
[PATCH v2 01/12] qdev: Add qdev_prop_set_array() |
|
Date: |
Mon, 30 Oct 2023 15:26:47 +0100 |
Instead of exposing the ugly hack of how we represent arrays in qdev (a
static "foo-len" property and after it is set, dynamically created
"foo[i]" properties) to boards, add an interface that allows setting the
whole array at once.
Once all internal users of devices with array properties have been
converted to use this function, we can change the implementation to move
away from this hack.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/qdev-properties.h | 3 +++
hw/core/qdev-properties.c | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index e1df08876c..7fa2fdb7c9 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -206,6 +206,9 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char
*name,
const uint8_t *value);
void qdev_prop_set_enum(DeviceState *dev, const char *name, int value);
+/* Takes ownership of @values */
+void qdev_prop_set_array(DeviceState *dev, const char *name, QList *values);
+
void *object_field_prop_ptr(Object *obj, Property *prop);
void qdev_prop_register_global(GlobalProperty *prop);
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 357b8761b5..fb4daba799 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -3,12 +3,14 @@
#include "qapi/error.h"
#include "qapi/qapi-types-misc.h"
#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qlist.h"
#include "qemu/ctype.h"
#include "qemu/error-report.h"
#include "qapi/visitor.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qdev-prop-internal.h"
+#include "qom/qom-qobject.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
@@ -739,6 +741,25 @@ void qdev_prop_set_enum(DeviceState *dev, const char
*name, int value)
&error_abort);
}
+void qdev_prop_set_array(DeviceState *dev, const char *name, QList *values)
+{
+ const QListEntry *entry;
+ g_autofree char *prop_len = g_strdup_printf("len-%s", name);
+ unsigned i = 0;
+
+ object_property_set_int(OBJECT(dev), prop_len, qlist_size(values),
+ &error_abort);
+
+ QLIST_FOREACH_ENTRY(values, entry) {
+ g_autofree char *prop_idx = g_strdup_printf("%s[%u]", name, i);
+ object_property_set_qobject(OBJECT(dev), prop_idx, entry->value,
+ &error_abort);
+ i++;
+ }
+
+ qobject_unref(values);
+}
+
static GPtrArray *global_props(void)
{
static GPtrArray *gp;
--
2.41.0
- [PATCH v2 00/12] qdev: Make array properties user accessible again, Kevin Wolf, 2023/10/30
- [PATCH v2 01/12] qdev: Add qdev_prop_set_array(),
Kevin Wolf <=
- [PATCH v2 04/12] hw/arm/mps2: Use qdev_prop_set_array(), Kevin Wolf, 2023/10/30
- [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