Add a new allow_set parameter to object*_property_add_field(),
and pass qdev_prop_allow_set as argument in the qdev registration
code.
This removes the last remaining line of code inside the core
field property code that's specific to TYPE_DEVICE, and will
allow us to make field properties a core QOM feature.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
Changes v1 -> v2:
* Redone patch on top of changes in previous patches in the
series
* Forbid allow_set==NULL to avoid confusion with link property
semantics (where NULL makes the property read only)
---
Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: "Daniel P. Berrangé" <berra...@redhat.com>
Cc: Eduardo Habkost <ehabk...@redhat.com>
Cc: qemu-devel@nongnu.org
---
hw/core/qdev-prop-internal.h | 4 +++-
include/hw/qdev-properties.h | 8 +++++++-
hw/core/qdev-properties.c | 35 +++++++++++++++++++++++------------
3 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h
index 0e16d28171..9fac681e38 100644
--- a/hw/core/qdev-prop-internal.h
+++ b/hw/core/qdev-prop-internal.h
@@ -32,12 +32,14 @@ void qdev_propinfo_get_size32(Object *obj, Visitor *v,
const char *name,
* @obj: object instance
* @name: property name
* @prop: property definition
+ * @allow_set: check function called when property is set
*
* This function should not be used in new code. Please add class properties
* instead, using object_class_add_field().
*/
ObjectProperty *
object_property_add_field(Object *obj, const char *name,
- Property *prop);
+ Property *prop,
+ ObjectPropertyAllowSet allow_set);
#endif
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index b301fe64d7..7f8d5fc206 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -179,16 +179,22 @@ extern const PropertyInfo qdev_prop_link;
* @oc: object class
* @name: property name
* @prop: property definition
+ * @allow_set: check function called when property is set
*
* Add a field property to an object class. A field property is
* a property that will change a field at a specific offset of the
* object instance struct.
*
* *@prop must exist for the life time of @oc.
+ *
+ * @allow_set should not be NULL. If the property can always be
+ * set, `prop_allow_set_always` can be used. If the property can
+ * never be set, `prop_allow_set_never` can be used.
*/
ObjectProperty *
object_class_property_add_field(ObjectClass *oc, const char *name,
- Property *prop);
+ Property *prop,
+ ObjectPropertyAllowSet allow_set);
/*
* Set properties between creation and realization.
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 5faf974c4f..ec9e456d95 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -25,13 +25,13 @@ void qdev_prop_set_after_realize(DeviceState *dev, const
char *name,
}
/* returns: true if property is allowed to be set, false otherwise */
-static bool qdev_prop_allow_set(Object *obj, const char *name,
+static bool qdev_prop_allow_set(Object *obj, ObjectProperty *op,
Error **errp)
{
DeviceState *dev = DEVICE(obj);
if (dev->realized) {
- qdev_prop_set_after_realize(dev, name, errp);
+ qdev_prop_set_after_realize(dev, op->name, errp);
return false;
}
return true;
@@ -79,10 +79,6 @@ static void field_prop_set(Object *obj, Visitor *v, const
char *name,
{
Property *prop = opaque;
- if (!qdev_prop_allow_set(obj, name, errp)) {
- return;
- }
-
return prop->info->set(obj, v, name, opaque, errp);
}
@@ -534,6 +530,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v,
const char *name,
* array itself and dynamically add the corresponding properties.
*/
Property *prop = opaque;
+ ObjectProperty *op = object_property_find_err(obj, name, &error_abort);
uint32_t *alenptr = qdev_get_prop_ptr(obj, prop);
void **arrayptr = (void *)obj + prop->arrayoffset;
void *eltptr;
@@ -574,7 +571,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v,
const char *name,
*/
arrayprop->offset = eltptr - (void *)obj;
assert(qdev_get_prop_ptr(obj, arrayprop) == eltptr);
- object_property_add_field(obj, propname, arrayprop);
+ object_property_add_field(obj, propname, arrayprop, op->allow_set);
}
}
@@ -789,9 +786,13 @@ const PropertyInfo qdev_prop_size = {
static ObjectProperty *create_link_property(ObjectClass *oc, const char *name,
Property *prop)
{
+ /*
+ * NOTE: object_property_allow_set_link is unconditional, but
+ * ObjectProperty.allow_set may be set for the property too.
+ */
return object_class_property_add_link(oc, name, prop->link_type,
prop->offset,
-
qdev_prop_allow_set_link_before_realize,
+ object_property_allow_set_link,
OBJ_PROP_LINK_STRONG);
}
@@ -801,10 +802,12 @@ const PropertyInfo qdev_prop_link = {
};
ObjectProperty *
-object_property_add_field(Object *obj, const char *name, Property *prop)
+object_property_add_field(Object *obj, const char *name, Property *prop,
+ ObjectPropertyAllowSet allow_set)
{
ObjectProperty *op;
+ assert(allow_set);
assert(!prop->info->create);
op = object_property_add(obj, name, prop->info->name,
@@ -823,15 +826,19 @@ object_property_add_field(Object *obj, const char *name,
Property *prop)
}
}
+ op->allow_set = allow_set;
return op;
}
ObjectProperty *
object_class_property_add_field(ObjectClass *oc, const char *name,
- Property *prop)
+ Property *prop,
+ ObjectPropertyAllowSet allow_set)
{
ObjectProperty *op;
+ assert(allow_set);
+
if (prop->info->create) {
op = prop->info->create(oc, name, prop);
} else {
@@ -849,12 +856,15 @@ object_class_property_add_field(ObjectClass *oc, const
char *name,
object_class_property_set_description(oc, name,
prop->info->description);
}
+
+ op->allow_set = allow_set;
return op;
}
void qdev_property_add_static(DeviceState *dev, Property *prop)
{
- object_property_add_field(OBJECT(dev), prop->qdev_prop_name, prop);
+ object_property_add_field(OBJECT(dev), prop->qdev_prop_name, prop,
+ qdev_prop_allow_set);
}
/**
@@ -911,7 +921,8 @@ void device_class_set_props(DeviceClass *dc, Property
*props)
dc->props_ = props;
for (prop = props; prop && prop->qdev_prop_name; prop++) {
qdev_class_add_legacy_property(dc, prop);
- object_class_property_add_field(oc, prop->qdev_prop_name, prop);
+ object_class_property_add_field(oc, prop->qdev_prop_name, prop,
+ qdev_prop_allow_set);
}
}
--
2.28.0
