[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/19] qom: field_prop_set_default_value() helper
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 11/19] qom: field_prop_set_default_value() helper |
Date: |
Mon, 23 Nov 2020 14:48:10 -0500 |
Move code that sets the property default value to a separate
function, to reduce duplication and make refactoring easier.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
This is a new patch added in v3 of this series.
Hopefully, this will make the series easier to review.
The field_prop_set_default_value() was added in v2 at
"qom: Use qlit to represent property defaults".
---
qom/field-property.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/qom/field-property.c b/qom/field-property.c
index cb729626ce..6a0df7c6ea 100644
--- a/qom/field-property.c
+++ b/qom/field-property.c
@@ -62,6 +62,17 @@ static void static_prop_release_dynamic_prop(Object *obj,
const char *name,
g_free(prop);
}
+static void field_prop_set_default_value(ObjectProperty *op,
+ Property *prop)
+{
+ if (!prop->set_default) {
+ return;
+ }
+
+ assert(prop->info->set_default_value);
+ prop->info->set_default_value(op, prop);
+}
+
ObjectProperty *
object_property_add_field(Object *obj, const char *name,
Property *prop,
@@ -83,11 +94,9 @@ object_property_add_field(Object *obj, const char *name,
object_property_set_description(obj, name,
newprop->info->description);
- if (newprop->set_default) {
- newprop->info->set_default_value(op, newprop);
- if (op->init) {
- op->init(obj, op);
- }
+ field_prop_set_default_value(op, newprop);
+ if (op->init) {
+ op->init(obj, op);
}
op->allow_set = allow_set;
@@ -113,9 +122,8 @@ object_class_property_add_field_static(ObjectClass *oc,
const char *name,
prop->info->release,
prop);
}
- if (prop->set_default) {
- prop->info->set_default_value(op, prop);
- }
+
+ field_prop_set_default_value(op, prop);
if (prop->info->description) {
object_class_property_set_description(oc, name,
prop->info->description);
--
2.28.0
- [PATCH v3 10/19] qlit: Support all types of QNums, (continued)
[PATCH v3 09/19] qlit: Add more test literals to qlit_equal_qobject() test case, Eduardo Habkost, 2020/11/23
[PATCH v3 08/19] qlit: Move qlit_equal_qobject() reference values to array, Eduardo Habkost, 2020/11/23
[PATCH v3 11/19] qom: field_prop_set_default_value() helper,
Eduardo Habkost <=
[PATCH v3 12/19] qom: Replace defval value in Property with QLitObject, Eduardo Habkost, 2020/11/23
[PATCH v3 13/19] qom: Fix documentation of UUID property type, Eduardo Habkost, 2020/11/23
[PATCH v3 15/19] qom: Make object_property_set_default() public, Eduardo Habkost, 2020/11/23
[PATCH v3 16/19] qom: Make PropertyInfo.set_default_value optional, Eduardo Habkost, 2020/11/23
[PATCH v3 17/19] qom: Delete field_prop_set_default_value_*int(), Eduardo Habkost, 2020/11/23
[PATCH v3 14/19] qom: Don't ignore defval on UUID property, Eduardo Habkost, 2020/11/23
[PATCH v3 19/19] qom: Delete set_default_value_bool(), Eduardo Habkost, 2020/11/23
[PATCH v3 18/19] qom: Delete set_default_uuid(), Eduardo Habkost, 2020/11/23