On Sun, 22 Sep 2013 14:50:54 +0800 Mark Wu <wu...@linux.vnet.ibm.com> wrote:
> Now we have several qemu-ga commands not returning response on success. > It has been documented in qga/qapi-schema.json already. This patch exposes > the 'success-response' flag by extending 'guest-info' command. With this > change, the clients can handle the command response more flexibly. > > Changes: > v2: add the notation 'since 1.7' to the option 'success-response' > (per Eric Blake's comments) > > Signed-off-by: Mark Wu <wu...@linux.vnet.ibm.com> Reviewed-by: Luiz Capitulino <lcapitul...@redhat.com> > --- > include/qapi/qmp/dispatch.h | 1 + > qapi/qmp-registry.c | 13 +++++++++++++ > qga/commands.c | 2 ++ > qga/qapi-schema.json | 5 ++++- > 4 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h > index 1ce11f5..f08c1dd 100644 > --- a/include/qapi/qmp/dispatch.h > +++ b/include/qapi/qmp/dispatch.h > @@ -48,6 +48,7 @@ QObject *qmp_dispatch(QObject *request); > void qmp_disable_command(const char *name); > void qmp_enable_command(const char *name); > bool qmp_command_is_enabled(const char *name); > +bool qmp_command_has_success_response(const char *name); > char **qmp_get_command_list(void); > QObject *qmp_build_error_object(Error *errp); > > diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c > index 28bbbe8..f86c3a5 100644 > --- a/qapi/qmp-registry.c > +++ b/qapi/qmp-registry.c > @@ -79,6 +79,19 @@ bool qmp_command_is_enabled(const char *name) > return false; > } > > +bool qmp_command_has_success_response(const char *name) > +{ > + QmpCommand *cmd; > + > + QTAILQ_FOREACH(cmd, &qmp_commands, node) { > + if (strcmp(cmd->name, name) == 0) { > + return cmd->options != QCO_NO_SUCCESS_RESP; > + } > + } > + > + return false; > +} > + > char **qmp_get_command_list(void) > { > QmpCommand *cmd; > diff --git a/qga/commands.c b/qga/commands.c > index 528b082..0df910b 100644 > --- a/qga/commands.c > +++ b/qga/commands.c > @@ -63,6 +63,8 @@ struct GuestAgentInfo *qmp_guest_info(Error **err) > cmd_info = g_malloc0(sizeof(GuestAgentCommandInfo)); > cmd_info->name = g_strdup(*cmd_list); > cmd_info->enabled = qmp_command_is_enabled(cmd_info->name); > + cmd_info->success_response = > + qmp_command_has_success_response(cmd_info->name); > > cmd_info_list = g_malloc0(sizeof(GuestAgentCommandInfoList)); > cmd_info_list->value = cmd_info; > diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json > index 7155b7a..9c6a58f 100644 > --- a/qga/qapi-schema.json > +++ b/qga/qapi-schema.json > @@ -141,10 +141,13 @@ > # > # @enabled: whether command is currently enabled by guest admin > # > +# @success-response: whether command returns a response on success > +# and only available since 1.7 > +# > # Since 1.1.0 > ## > { 'type': 'GuestAgentCommandInfo', > - 'data': { 'name': 'str', 'enabled': 'bool' } } > + 'data': { 'name': 'str', 'enabled': 'bool', 'success-response': 'bool' } } > > ## > # @GuestAgentInfo