qom: shorten name of object_set_properties_from_keyval
This matches the convention established by the object_set_props and object_set_propv methods. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Daniel P. Berrangé committed
Apr 17, 2026 at 16:09 UTC
66964fa3f38311d8deb700c8ef5fc52578573c6b
4 files changed
+15
-14
include/qom/object.h
+3
-3
@@ -915,7 +915,7 @@ type_init(do_qemu_init_ ## type_array)
915
bool type_print_class_properties(const char *type);
916
917
/**
918
- * object_set_properties_from_keyval:
918
+ * object_set_props_from_keyval:
919
* @obj: a QOM object
920
* @qdict: a dictionary with the properties to be set
921
* @from_json: true if leaf values of @qdict are typed, false if they
@@ -925,8 +925,8 @@ bool type_print_class_properties(const char *type);
925
* For each key in the dictionary, parse the value string if needed,
926
* then set the corresponding property in @obj.
927
*/
928
-void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
929
- bool from_json, Error **errp);
928
+void object_set_props_from_keyval(Object *obj, const QDict *qdict,
929
+ bool from_json, Error **errp);
930
931
/**
932
* object_class_dynamic_cast_assert:
qom/object_interfaces.c
+6
-6
@@ -44,8 +44,8 @@ bool user_creatable_can_be_deleted(UserCreatable *uc)
44
}
45
}
46
47
-static void object_set_properties_from_qdict(Object *obj, const QDict *qdict,
48
- Visitor *v, Error **errp)
47
+static void object_set_props_from_qdict(Object *obj, const QDict *qdict,
48
+ Visitor *v, Error **errp)
49
{
50
const QDictEntry *e;
51
@@ -62,8 +62,8 @@ out:
62
visit_end_struct(v, NULL);
63
}
64
65
-void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
66
- bool from_json, Error **errp)
65
+void object_set_props_from_keyval(Object *obj, const QDict *qdict,
66
+ bool from_json, Error **errp)
67
{
68
Visitor *v;
69
if (from_json) {
@@ -71,7 +71,7 @@ void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
71
} else {
72
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
73
}
74
- object_set_properties_from_qdict(obj, qdict, v, errp);
74
+ object_set_props_from_qdict(obj, qdict, v, errp);
75
visit_free(v);
76
}
77
@@ -110,7 +110,7 @@ Object *user_creatable_add_type(const char *type, const char *id,
110
111
assert(qdict);
112
obj = object_new_with_class(klass);
113
- object_set_properties_from_qdict(obj, qdict, v, &local_err);
113
+ object_set_props_from_qdict(obj, qdict, v, &local_err);
114
if (local_err) {
115
goto out;
116
}
system/qdev-monitor.c
+2
-2
@@ -730,8 +730,8 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
730
qdict_del(properties, "bus");
731
qdict_del(properties, "id");
732
733
- object_set_properties_from_keyval(&dev->parent_obj, properties, from_json,
734
- errp);
733
+ object_set_props_from_keyval(&dev->parent_obj, properties, from_json,
734
+ errp);
735
qobject_unref(properties);
736
if (*errp) {
737
goto err_del_dev;
system/vl.c
+4
-3
@@ -2010,7 +2010,8 @@ static bool object_create_early(const char *type)
2010
2011
static void qemu_apply_machine_options(QDict *qdict)
2012
{
2013
- object_set_properties_from_keyval(OBJECT(current_machine), qdict, false, &error_fatal);
2013
+ object_set_props_from_keyval(OBJECT(current_machine), qdict,
2014
+ false, &error_fatal);
2015
2016
if (semihosting_enabled(false) && !semihosting_get_argc()) {
2017
/* fall back to the -kernel/-append */
@@ -2225,8 +2226,8 @@ static void qemu_create_machine(QDict *qdict)
2226
keyval_parse(machine_class->default_machine_opts, NULL, NULL,
2227
&error_abort);
2228
qemu_apply_legacy_machine_options(default_opts);
2228
- object_set_properties_from_keyval(OBJECT(current_machine), default_opts,
2229
- false, &error_abort);
2229
+ object_set_props_from_keyval(OBJECT(current_machine), default_opts,
2230
+ false, &error_abort);
2231
qobject_unref(default_opts);
2232
}
2233
}