From 89d7fa9eb4a0a75bb1bc1bf24e9e79ebe91fd7b0 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Wed, 7 May 2014 18:08:29 +0200 Subject: qom: Implement qom-list HMP command Implement it as a wrapper for QMP qom-list, but mimic the behavior of scripts/qmp/qom-list in making the path argument optional and listing the root if absent, to hint users what kind of path to pass. Reviewed-by: Gonglei Tested-by: Alistair Francis Signed-off-by: Andreas Färber --- hmp.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'hmp.c') diff --git a/hmp.c b/hmp.c index f6cde86b93..92decae338 100644 --- a/hmp.c +++ b/hmp.c @@ -1866,3 +1866,29 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) qapi_free_MemoryDeviceInfoList(info_list); } + +void hmp_qom_list(Monitor *mon, const QDict *qdict) +{ + const char *path = qdict_get_try_str(qdict, "path"); + ObjectPropertyInfoList *list; + Error *err = NULL; + + if (path == NULL) { + monitor_printf(mon, "/\n"); + return; + } + + list = qmp_qom_list(path, &err); + if (err == NULL) { + ObjectPropertyInfoList *start = list; + while (list != NULL) { + ObjectPropertyInfo *value = list->value; + + monitor_printf(mon, "%s (%s)\n", + value->name, value->type); + list = list->next; + } + qapi_free_ObjectPropertyInfoList(start); + } + hmp_handle_error(mon, &err); +} -- cgit v1.2.3-55-g7522 From c0e6ee9e6f49d4a3183b05f457cc2704a966fce5 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Wed, 7 May 2014 19:48:15 +0200 Subject: qom: Implement qom-set HMP command Re-implemented based on qmp_qom_set() to facilitate argument parsing. Warn about ambiguous path arguments. Reviewed-by: Gonglei Tested-by: Alistair Francis Signed-off-by: Andreas Färber --- hmp-commands.hx | 13 +++++++++++++ hmp.c | 21 +++++++++++++++++++++ hmp.h | 1 + 3 files changed, 35 insertions(+) (limited to 'hmp.c') diff --git a/hmp-commands.hx b/hmp-commands.hx index 527fa2dc1a..d9f6c037dc 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1684,6 +1684,19 @@ ETEXI STEXI @item qom-list [@var{path}] Print QOM properties of object at location @var{path} +ETEXI + + { + .name = "qom-set", + .args_type = "path:s,property:s,value:s", + .params = "path property value", + .help = "set QOM property", + .mhandler.cmd = hmp_qom_set, + }, + +STEXI +@item qom-set @var{path} @var{property} @var{value} +Set QOM property @var{property} of object at location @var{path} to value @var{value} ETEXI { diff --git a/hmp.c b/hmp.c index 92decae338..ad1beba80d 100644 --- a/hmp.c +++ b/hmp.c @@ -1892,3 +1892,24 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict) } hmp_handle_error(mon, &err); } + +void hmp_qom_set(Monitor *mon, const QDict *qdict) +{ + 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; + bool ambiguous = false; + Object *obj; + + obj = object_resolve_path(path, &ambiguous); + if (obj == NULL) { + error_set(&err, QERR_DEVICE_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); +} diff --git a/hmp.h b/hmp.h index c5676e2f2e..2b9308be7c 100644 --- a/hmp.h +++ b/hmp.h @@ -97,6 +97,7 @@ void hmp_object_del(Monitor *mon, const QDict *qdict); void hmp_info_memdev(Monitor *mon, const QDict *qdict); void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); void hmp_qom_list(Monitor *mon, const QDict *qdict); +void hmp_qom_set(Monitor *mon, const QDict *qdict); void object_add_completion(ReadLineState *rs, int nb_args, const char *str); void object_del_completion(ReadLineState *rs, int nb_args, const char *str); void device_add_completion(ReadLineState *rs, int nb_args, const char *str); -- cgit v1.2.3-55-g7522