diff mbox

qemu-ga: report success-response field in guest-info

Message ID dbb816bb3aadec3a3d3bb24a83c5444d977cdb41.1345544709.git.mprivozn@redhat.com
State New
Headers show

Commit Message

Michal Privoznik Aug. 21, 2012, 10:25 a.m. UTC 
This is a useful hint for users (or libvirt) whether a command returns
anything success and hence wait for reply or not.
---
 qapi-schema-guest.json |    6 +++++-
 qapi/qmp-core.h        |    1 +
 qapi/qmp-registry.c    |   12 ++++++++++++
 qga/commands.c         |    1 +
 4 files changed, 19 insertions(+), 1 deletions(-)

Comments

Paolo Bonzini Aug. 21, 2012, 11:56 a.m. UTC | #1 
Il 21/08/2012 12:25, Michal Privoznik ha scritto:
> +bool qmp_command_reports_success(const char *name) {
> +    QmpCommand *cmd;
> +
> +    QTAILQ_FOREACH(cmd, &qmp_commands, node) {
> +        if (strcmp(cmd->name, name) == 0) {
> +            return cmd->options ^ QCO_NO_SUCCESS_RESP;

Clever... but please use (a & b) == 0 instead...

Paolo

> +        }
> +    }
> +
> +    return true;
> +}
> +
diff mbox

Patch

diff --git a/qapi-schema-guest.json b/qapi-schema-guest.json
index d955cf1..2cd5957 100644
--- a/qapi-schema-guest.json
+++ b/qapi-schema-guest.json
@@ -91,10 +91,14 @@ 
 #
 # @enabled: whether command is currently enabled by guest admin
 #
+# @success-response: whether command report success response or not.
+#                    See 'uest-shutdown' command for more detailed info.
+#
 # Since 1.1.0
 ##
 { 'type': 'GuestAgentCommandInfo',
-  'data': { 'name': 'str', 'enabled': 'bool' } }
+  'data': { 'name': 'str', 'enabled': 'bool',
+            'success-response': 'bool'} }
 
 ##
 # @GuestAgentInfo
diff --git a/qapi/qmp-core.h b/qapi/qmp-core.h
index 00446cf..271c3f2 100644
--- a/qapi/qmp-core.h
+++ b/qapi/qmp-core.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_reports_success(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 5414613..d706cb1 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -77,6 +77,18 @@  bool qmp_command_is_enabled(const char *name)
     return false;
 }
 
+bool qmp_command_reports_success(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 true;
+}
+
 char **qmp_get_command_list(void)
 {
     QmpCommand *cmd;
diff --git a/qga/commands.c b/qga/commands.c
index 46b0b08..9811221 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -63,6 +63,7 @@  struct GuestAgentInfo *qmp_guest_info(Error **err)
         cmd_info = g_malloc0(sizeof(GuestAgentCommandInfo));
         cmd_info->name = strdup(*cmd_list);
         cmd_info->enabled = qmp_command_is_enabled(cmd_info->name);
+        cmd_info->success_response = qmp_command_reports_success(cmd_info->name);
 
         cmd_info_list = g_malloc0(sizeof(GuestAgentCommandInfoList));
         cmd_info_list->value = cmd_info;