starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

qom: shorten name of object_set_properties_from_keyval

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé
2026-04-17 16:09:07 +01:00
parent 23f3d3d3bb
commit 66964fa3f3
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/qom/object.h
View File

@@ -915,7 +915,7 @@ type_init(do_qemu_init_ ## type_array)
bool type_print_class_properties(const char *type);
/**
* object_set_properties_from_keyval:
* object_set_props_from_keyval:
* @obj: a QOM object
* @qdict: a dictionary with the properties to be set
* @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);
* For each key in the dictionary, parse the value string if needed,
* then set the corresponding property in @obj.
*/
void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
bool from_json, Error **errp);
void object_set_props_from_keyval(Object *obj, const QDict *qdict,
bool from_json, Error **errp);
/**
* object_class_dynamic_cast_assert:

12
qom/object_interfaces.c
View File

@@ -44,8 +44,8 @@ bool user_creatable_can_be_deleted(UserCreatable *uc)
}
}
static void object_set_properties_from_qdict(Object *obj, const QDict *qdict,
Visitor *v, Error **errp)
static void object_set_props_from_qdict(Object *obj, const QDict *qdict,
Visitor *v, Error **errp)
{
const QDictEntry *e;
@@ -62,8 +62,8 @@ out:
visit_end_struct(v, NULL);
}
void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
bool from_json, Error **errp)
void object_set_props_from_keyval(Object *obj, const QDict *qdict,
bool from_json, Error **errp)
{
Visitor *v;
if (from_json) {
@@ -71,7 +71,7 @@ void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
} else {
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
}
object_set_properties_from_qdict(obj, qdict, v, errp);
object_set_props_from_qdict(obj, qdict, v, errp);
visit_free(v);
}
@@ -110,7 +110,7 @@ Object *user_creatable_add_type(const char *type, const char *id,
assert(qdict);
obj = object_new_with_class(klass);
object_set_properties_from_qdict(obj, qdict, v, &local_err);
object_set_props_from_qdict(obj, qdict, v, &local_err);
if (local_err) {
goto out;
}

4
system/qdev-monitor.c
View File

@@ -730,8 +730,8 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
qdict_del(properties, "bus");
qdict_del(properties, "id");
object_set_properties_from_keyval(&dev->parent_obj, properties, from_json,
errp);
object_set_props_from_keyval(&dev->parent_obj, properties, from_json,
errp);
qobject_unref(properties);
if (*errp) {
goto err_del_dev;

7
system/vl.c
View File

@@ -2010,7 +2010,8 @@ static bool object_create_early(const char *type)
static void qemu_apply_machine_options(QDict *qdict)
{
object_set_properties_from_keyval(OBJECT(current_machine), qdict, false, &error_fatal);
object_set_props_from_keyval(OBJECT(current_machine), qdict,
false, &error_fatal);
if (semihosting_enabled(false) && !semihosting_get_argc()) {
/* fall back to the -kernel/-append */
@@ -2225,8 +2226,8 @@ static void qemu_create_machine(QDict *qdict)
keyval_parse(machine_class->default_machine_opts, NULL, NULL,
&error_abort);
qemu_apply_legacy_machine_options(default_opts);
object_set_properties_from_keyval(OBJECT(current_machine), default_opts,
false, &error_abort);
object_set_props_from_keyval(OBJECT(current_machine), default_opts,
false, &error_abort);
qobject_unref(default_opts);
}
}