vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hmp: Make json format optional for qom-set 

Commit 7d2ef6dcc1 ("hmp: Simplify qom-set") switched to the json
parser, making it possible to specify complex types. However, with this
change it is no longer possible to specify proper sizes (e.g., 2G, 128M),
turning the interface harder to use for properties that consume sizes.

Let's switch back to the previous handling and allow to specify passing
json via the "-j" parameter.

Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200610075153.33892-1-david@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
master
David Hildenbrand 2020-06-10 09:51:53 +02:00 committed by Dr. David Alan Gilbert
parent 246da7db3c
commit 2d9e3dd9be
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hmp-commands.hx
View File

@ -1806,9 +1806,10 @@ ERST
{
.name = "qom-set",
.args_type = "path:s,property:s,value:S",
.params = "path property value",
.help = "set QOM property",
.args_type = "json:-j,path:s,property:s,value:S",
.params = "[-j] path property value",
.help = "set QOM property.\n\t\t\t"
"-j: the value is specified in json format.",
.cmd = hmp_qom_set,
.flags = "p",
},

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

@ -44,15 +44,27 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict)
void hmp_qom_set(Monitor *mon, const QDict *qdict)
{
const bool json = qdict_get_try_bool(qdict, "json", false);
const char *path = qdict_get_str(qdict, "path");
const char *property = qdict_get_str(qdict, "property");
const char *value = qdict_get_str(qdict, "value");
Error *err = NULL;
QObject *obj;
obj = qobject_from_json(value, &err);
if (err == NULL) {
qmp_qom_set(path, property, obj, &err);
if (!json) {
Object *obj = object_resolve_path(path, NULL);
if (!obj) {
error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND,
"Device '%s' not found", path);
} else {
object_property_parse(obj, value, property, &err);
}
} else {
QObject *obj = qobject_from_json(value, &err);
if (!err) {
qmp_qom_set(path, property, obj, &err);
}
}
hmp_handle_error(mon, err);