[Qemu-devel] [PATCH 01/12] qapi-schema: use generated marshaller for 'qmp_capabilities'

[marcandre . lureau]

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

qapi'fy the 'qmp_capabilities' command.

Signed-off-by: Marc-André Lureau <address@hidden>
---
 monitor.c        |  4 ++--
 qapi-schema.json | 19 +++++++++++++++++++
 qmp-commands.hx  |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/monitor.c b/monitor.c
index bbd5134..63f7086 100644
--- a/monitor.c
+++ b/monitor.c
@@ -615,7 +615,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;
 }
@@ -3601,7 +3601,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 511c98b..73f0b6f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -20,6 +20,25 @@
 # QAPI introspection
 { 'include': 'qapi/introspect.json' }
 
+##
+# @qmp_capabilities:
+#
+# Enable QMP capabilities.
+#
+# Arguments: None.
+#
+# Example:
+#
+# -> { "execute": "qmp_capabilities" }
+# <- { "return": {} }
+#
+# Notes: This command is valid exactly when first connecting: it must be
+# issued before any other command will be accepted, and will fail once the
+# monitor is accepting other commands.
+#
+##
+{ 'command': 'qmp_capabilities' }
+
 ##
 # @LostTickPolicy:
 #
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 09b1e38..ee88e48 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2197,7 +2197,7 @@ EQMP
         .args_type  = "",
         .params     = "",
         .help       = "enable QMP capabilities",
-        .mhandler.cmd_new = qmp_capabilities,
+        .mhandler.cmd_new = qmp_marshal_qmp_capabilities,
     },
 
 SQMP
-- 
2.9.0