mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:46:17 +00:00
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>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user