On Thu, May 08, 2014 at 04:21:17PM +0200, Andreas Färber wrote:
> Re-implemented based on qmp_qom_set() to facilitate argument parsing.
>
> Signed-off-by: Andreas Färber <afaer...@suse.de>
> ---
> hmp-commands.hx | 13 +++++++++++++
> hmp.c | 18 ++++++++++++++++++
> hmp.h | 1 +
> 3 files changed, 32 insertions(+)
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index c0603e9..73145b7 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1704,6 +1704,19 @@ Print QOM property @var{property} 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
> +
> + {
> .name = "info",
> .args_type = "item:s?",
> .params = "[subcommand]",
> diff --git a/hmp.c b/hmp.c
> index d7d7a98..1cc2e60 100644
> --- a/hmp.c
> +++ b/hmp.c
> @@ -1715,3 +1715,21 @@ void hmp_qom_get(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;
> + Object *obj;
> +
> + obj = object_resolve_path(path, NULL);
Is there any consensus on whether to check for path ambiguity ?
It seems to me that it would be more important to do so here than in
qmp_qom_list() for example.
Other than that, patch looks fine for me.
> + if (obj == NULL) {
> + error_set(&err, QERR_DEVICE_NOT_FOUND, path);
> + hmp_handle_error(mon, &err);
> + return;
> + }
> + object_property_parse(obj, value, property, &err);
> + hmp_handle_error(mon, &err);
> +}
> diff --git a/hmp.h b/hmp.h
> index 269d99e..6b7b1da 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -95,6 +95,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict);
> void hmp_object_del(Monitor *mon, const QDict *qdict);
> void hmp_qom_list(Monitor *mon, const QDict *qdict);
> void hmp_qom_get(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);
> --
> 1.8.4.5
>
>
