cli: add --preconfig option

[qemu.git] / qapi / qmp-dispatch.c

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 48bec2072be1a19e03dbe2282d756130e540a0d6..935f9e159c075c7f75e378f0eba3985d35a794b9 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -13,14 +13,14 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"

-#include "qapi/qmp/types.h"

 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"

+#include "qapi/qmp/qdict.h"

 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qjson.h"

-#include "qapi-types.h"
-#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qbool.h"
+#include "sysemu/sysemu.h"

 
 

-static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
+QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)

 {
     const QDictEntry *ent;
     const char *arg_name;
 {
     const QDictEntry *ent;
     const char *arg_name;


@@ -28,10 +28,9 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
     bool has_exec_key = false;
     QDict *dict = NULL;
 
     bool has_exec_key = false;
     QDict *dict = NULL;
 

-    dict = qobject_to_qdict(request);
+    dict = qobject_to(QDict, request);

     if (!dict) {
     if (!dict) {

-        error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT,
-                   "request is not a dictionary");
+        error_setg(errp, "QMP input must be a JSON object");

         return NULL;
     }
 
         return NULL;
     }
 


@@ -42,26 +41,42 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
 
         if (!strcmp(arg_name, "execute")) {
             if (qobject_type(arg_obj) != QTYPE_QSTRING) {
 
         if (!strcmp(arg_name, "execute")) {
             if (qobject_type(arg_obj) != QTYPE_QSTRING) {

-                error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
-                           "string");
+                error_setg(errp,
+                           "QMP input member 'execute' must be a string");

                 return NULL;
             }
             has_exec_key = true;
                 return NULL;
             }
             has_exec_key = true;

-        } else if (strcmp(arg_name, "arguments")) {
-            error_setg(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
+        } else if (!strcmp(arg_name, "arguments")) {
+            if (qobject_type(arg_obj) != QTYPE_QDICT) {
+                error_setg(errp,
+                           "QMP input member 'arguments' must be an object");
+                return NULL;
+            }
+        } else if (!strcmp(arg_name, "id")) {
+            continue;
+        } else if (!strcmp(arg_name, "control")) {
+            if (qobject_type(arg_obj) != QTYPE_QDICT) {
+                error_setg(errp,
+                           "QMP input member 'control' must be a dict");
+                return NULL;
+            }
+        } else {
+            error_setg(errp, "QMP input member '%s' is unexpected",
+                       arg_name);

             return NULL;
         }
     }
 
     if (!has_exec_key) {
             return NULL;
         }
     }
 
     if (!has_exec_key) {

-        error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
+        error_setg(errp, "QMP input lacks member 'execute'");

         return NULL;
     }
 
     return dict;
 }
 
         return NULL;
     }
 
     return dict;
 }
 

-static QObject *do_qmp_dispatch(QObject *request, Error **errp)
+static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request,
+                                Error **errp)

 {
     Error *local_err = NULL;
     const char *command;
 {
     Error *local_err = NULL;
     const char *command;


@@ -75,7 +90,7 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp)
     }
 
     command = qdict_get_str(dict, "execute");
     }
 
     command = qdict_get_str(dict, "execute");

-    cmd = qmp_find_command(command);
+    cmd = qmp_find_command(cmds, command);

     if (cmd == NULL) {
         error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
                   "The command %s has not been found", command);
     if (cmd == NULL) {
         error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
                   "The command %s has not been found", command);


@@ -87,11 +102,18 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp)
         return NULL;
     }
 
         return NULL;
     }
 

+    if (runstate_check(RUN_STATE_PRECONFIG) &&
+        !(cmd->options & QCO_ALLOW_PRECONFIG)) {
+        error_setg(errp, "The command '%s' isn't permitted in '%s' state",
+                   cmd->name, RunState_str(RUN_STATE_PRECONFIG));
+        return NULL;
+    }
+

     if (!qdict_haskey(dict, "arguments")) {
         args = qdict_new();
     } else {
         args = qdict_get_qdict(dict, "arguments");
     if (!qdict_haskey(dict, "arguments")) {
         args = qdict_new();
     } else {
         args = qdict_get_qdict(dict, "arguments");

-        QINCREF(args);
+        qobject_ref(args);

     }
 
     cmd->fn(args, &ret, &local_err);
     }
 
     cmd->fn(args, &ret, &local_err);


@@ -103,7 +125,7 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp)
         ret = QOBJECT(qdict_new());
     }
 
         ret = QOBJECT(qdict_new());
     }
 

-    QDECREF(args);
+    qobject_unref(args);

 
     return ret;
 }
 
     return ret;
 }


@@ -111,17 +133,39 @@ static QObject *do_qmp_dispatch(QObject *request, Error **errp)
 QObject *qmp_build_error_object(Error *err)
 {
     return qobject_from_jsonf("{ 'class': %s, 'desc': %s }",
 QObject *qmp_build_error_object(Error *err)
 {
     return qobject_from_jsonf("{ 'class': %s, 'desc': %s }",

-                              QapiErrorClass_lookup[error_get_class(err)],
+                              QapiErrorClass_str(error_get_class(err)),

                               error_get_pretty(err));
 }
 
                               error_get_pretty(err));
 }
 

-QObject *qmp_dispatch(QObject *request)
+/*
+ * Detect whether a request should be run out-of-band, by quickly
+ * peeking at whether we have: { "control": { "run-oob": true } }. By
+ * default commands are run in-band.
+ */
+bool qmp_is_oob(QDict *dict)
+{
+    QBool *bool_obj;
+
+    dict = qdict_get_qdict(dict, "control");
+    if (!dict) {
+        return false;
+    }
+
+    bool_obj = qobject_to(QBool, qdict_get(dict, "run-oob"));
+    if (!bool_obj) {
+        return false;
+    }
+
+    return qbool_get_bool(bool_obj);
+}
+
+QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request)

 {
     Error *err = NULL;
     QObject *ret;
     QDict *rsp;
 
 {
     Error *err = NULL;
     QObject *ret;
     QDict *rsp;
 

-    ret = do_qmp_dispatch(request, &err);
+    ret = do_qmp_dispatch(cmds, request, &err);

 
     rsp = qdict_new();
     if (err) {
 
     rsp = qdict_new();
     if (err) {


@@ -130,7 +174,7 @@ QObject *qmp_dispatch(QObject *request)
     } else if (ret) {
         qdict_put_obj(rsp, "return", ret);
     } else {
     } else if (ret) {
         qdict_put_obj(rsp, "return", ret);
     } else {

-        QDECREF(rsp);
+        qobject_unref(rsp);

         return NULL;
     }
 
         return NULL;
     }