mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hmp: Simplify qom-set

Browse Source 
Simplify qom_set by making it use qmp_qom_set and the JSON parser.

(qemu) qom-get /machine smm
"auto"
(qemu) qom-set /machine smm "auto"

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200520151108.160598-3-dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  With 's'->'S' type change suggested by Paolo and Markus
This commit is contained in:
Dr. David Alan Gilbert 2020-05-20 16:11:08 +01:00
parent 89cf4fe34f
commit 7d2ef6dcc1
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp-commands.hx
View File

@ -1806,7 +1806,7 @@ ERST
{ {
.name = "qom-set", .name = "qom-set",
.args_type = "path:s,property:s,value:s", .args_type = "path:s,property:s,value:S",
.params = "path property value", .params = "path property value",
.help = "set QOM property", .help = "set QOM property",
.cmd = hmp_qom_set, .cmd = hmp_qom_set,

16
qom/qom-hmp-cmds.c
View File

@ -48,19 +48,13 @@ void hmp_qom_set(Monitor *mon, const QDict *qdict)
const char *property = qdict_get_str(qdict, "property"); const char *property = qdict_get_str(qdict, "property");
const char *value = qdict_get_str(qdict, "value"); const char *value = qdict_get_str(qdict, "value");
Error *err = NULL; Error *err = NULL;
bool ambiguous = false; QObject *obj;
Object *obj;
obj = object_resolve_path(path, &ambiguous); obj = qobject_from_json(value, &err);
if (obj == NULL) { if (err == NULL) {
error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND, qmp_qom_set(path, property, obj, &err);
"Device '%s' not found", path);
} else {
if (ambiguous) {
monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", path);
}
object_property_parse(obj, value, property, &err);
} }
hmp_handle_error(mon, err); hmp_handle_error(mon, err);
} }