[Qemu-devel] [PATCH for-2.5 3/4] monitor: use qapi for qmp_capabilities command

[Eric Blake]

From: Marc-André Lureau <address@hidden>

This was initially done to add qmp_capabilities documentation to the
schema. Then I figured it would also help to get rid of the "middle
mode" monitor dispatch code.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Add empty 'Capabilities' to make it obvious that we don't have any yet.]
Signed-off-by: Eric Blake <address@hidden>
---
 monitor.c        |  4 ++--
 qapi-schema.json | 28 ++++++++++++++++++++++++++++
 qmp-commands.hx  |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/monitor.c b/monitor.c
index 3295840..608c70f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -599,7 +599,7 @@ static void monitor_qapi_event_init(void)
     qmp_event_set_func_emit(monitor_qapi_event_queue);
 }

-static void qmp_capabilities(QDict *params, QObject **ret_data, Error **errp)
+void qmp_qmp_capabilities(Error **errp)
 {
     cur_mon->qmp.in_command_mode = true;
 }
@@ -3575,7 +3575,7 @@ static int monitor_can_read(void *opaque)
 static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
                              Error **errp)
 {
-    bool is_cap = cmd->mhandler.cmd_new == qmp_capabilities;
+    bool is_cap = cmd->mhandler.cmd_new == qmp_marshal_qmp_capabilities;

     if (is_cap && mon->qmp.in_command_mode) {
         error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
diff --git a/qapi-schema.json b/qapi-schema.json
index f99d413..ce2dd45 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -21,6 +21,34 @@
 { 'include': 'qapi/introspect.json' }

 ##
+# @Capabilities
+#
+# The set of recognized QMP capabilities; currently empty.
+#
+# Since 2.5
+##
+{ 'struct': 'Capabilities', 'data': {} }
+
+##
+# @qmp_capabilities:
+#
+# Enable QMP capabilities.
+#
+# Arguments: None.
+#
+# Example:
+#
+# -> { "execute": "qmp_capabilities" }
+# <- { "return": {} }
+#
+# Notes: This command must be issued before issuing any other command.
+#
+# Since 0.14
+#
+##
+{ 'command': 'qmp_capabilities', 'data': 'Capabilities' }
+
+##
 # @LostTickPolicy:
 #
 # Policy for handling lost ticks in timer devices.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index cde7505..672fcfc 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2090,7 +2090,7 @@ EQMP
         .args_type  = "",
         .params     = "",
         .help       = "enable QMP capabilities",
-        .mhandler.cmd_new = qmp_capabilities,
+        .mhandler.cmd_new = qmp_marshal_qmp_capabilities,
     },

 SQMP
-- 
2.4.3