qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: Luiz Capitulino <lcapitulino@gmail.com>,
	qemu-devel@nongnu.org, Michael Roth <mdroth@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 12/25] qapi: add QMP dispatch functions
Date: Thu, 21 Jul 2011 17:01:01 -0300	[thread overview]
Message-ID: <1311278474-24336-13-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1311278474-24336-1-git-send-email-lcapitulino@redhat.com>

From: Michael Roth <mdroth@linux.vnet.ibm.com>

Given an object recieved via QMP, this code uses the dispatch table
provided by qmp_registry.c to call the corresponding marshalling/dispatch
function and format return values/errors for delivery to the QMP.
Currently only synchronous QMP functions are supported, but this will
also be used for async QMP functions and QMP guest proxy dispatch as
well.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
---
 Makefile.objs       |    2 +-
 qapi/qmp-core.h     |    2 +
 qapi/qmp-dispatch.c |  124 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 1 deletions(-)
 create mode 100644 qapi/qmp-dispatch.c

diff --git a/Makefile.objs b/Makefile.objs
index c918ee7..52ad77b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -376,7 +376,7 @@ libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o
 # qapi
 
 qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi-dealloc-visitor.o
-qapi-nested-y += qmp-registry.o
+qapi-nested-y += qmp-registry.o qmp-dispatch.o
 qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
 
 vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
diff --git a/qapi/qmp-core.h b/qapi/qmp-core.h
index 8b96d2c..f1c26e4 100644
--- a/qapi/qmp-core.h
+++ b/qapi/qmp-core.h
@@ -35,5 +35,7 @@ typedef struct QmpCommand
 
 void qmp_register_command(const char *name, QmpCommandFunc *fn);
 QmpCommand *qmp_find_command(const char *name);
+QObject *qmp_dispatch(QObject *request);
 
 #endif
+
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
new file mode 100644
index 0000000..5584693
--- /dev/null
+++ b/qapi/qmp-dispatch.c
@@ -0,0 +1,124 @@
+/*
+ * Core Definitions for QAPI/QMP Dispatch
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ *  Anthony Liguori   <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ *
+ */
+
+#include "qemu-objects.h"
+#include "qapi/qmp-core.h"
+#include "json-parser.h"
+#include "error.h"
+#include "error_int.h"
+#include "qerror.h"
+
+static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
+{
+    const QDictEntry *ent;
+    const char *arg_name;
+    const QObject *arg_obj;
+    bool has_exec_key = false;
+    QDict *dict = NULL;
+
+    if (qobject_type(request) != QTYPE_QDICT) {
+        error_set(errp, QERR_QMP_BAD_INPUT_OBJECT,
+                  "request is not a dictionary");
+        return NULL;
+    }
+
+    dict = qobject_to_qdict(request);
+
+    for (ent = qdict_first(dict); ent;
+         ent = qdict_next(dict, ent)) {
+        arg_name = qdict_entry_key(ent);
+        arg_obj = qdict_entry_value(ent);
+
+        if (!strcmp(arg_name, "execute")) {
+            if (qobject_type(arg_obj) != QTYPE_QSTRING) {
+                error_set(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
+                          "string");
+                return NULL;
+            }
+            has_exec_key = true;
+        } else if (strcmp(arg_name, "arguments")) {
+            error_set(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
+            return NULL;
+        }
+    }
+
+    if (!has_exec_key) {
+        error_set(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
+        return NULL;
+    }
+
+    return dict;
+}
+
+static QObject *do_qmp_dispatch(QObject *request, Error **errp)
+{
+    const char *command;
+    QDict *args, *dict;
+    QmpCommand *cmd;
+    QObject *ret = NULL;
+
+
+    dict = qmp_dispatch_check_obj(request, errp);
+    if (!dict || error_is_set(errp)) {
+        return NULL;
+    }
+
+    command = qdict_get_str(dict, "execute");
+    cmd = qmp_find_command(command);
+    if (cmd == NULL) {
+        error_set(errp, QERR_COMMAND_NOT_FOUND, command);
+        return NULL;
+    }
+
+    if (!qdict_haskey(dict, "arguments")) {
+        args = qdict_new();
+    } else {
+        args = qdict_get_qdict(dict, "arguments");
+        QINCREF(args);
+    }
+
+    switch (cmd->type) {
+    case QCT_NORMAL:
+        cmd->fn(args, &ret, errp);
+        if (!error_is_set(errp) && ret == NULL) {
+            ret = QOBJECT(qdict_new());
+        }
+        break;
+    }
+
+    QDECREF(args);
+
+    return ret;
+}
+
+QObject *qmp_dispatch(QObject *request)
+{
+    Error *err = NULL;
+    QObject *ret;
+    QDict *rsp;
+
+    ret = do_qmp_dispatch(request, &err);
+
+    rsp = qdict_new();
+    if (err) {
+        qdict_put_obj(rsp, "error", error_get_qobject(err));
+        error_free(err);
+    } else if (ret) {
+        qdict_put_obj(rsp, "return", ret);
+    } else {
+        QDECREF(rsp);
+        return NULL;
+    }
+
+    return QOBJECT(rsp);
+}
-- 
1.7.6.233.gd79bc

  parent reply	other threads:[~2011-07-21 20:03 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-21 20:00 [Qemu-devel] [PULL 0/25]: QMP queue Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 01/25] QMP: add snapshot-blkdev-sync command Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 02/25] Introduce compiler.h header file Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 03/25] Error: Fix build when qemu-common.h is not included Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 04/25] Add hard build dependency on glib Luiz Capitulino
2011-08-02  2:03   ` TeLeMan
2011-08-02 19:06     ` Luiz Capitulino
2011-08-02 19:18       ` Anthony Liguori
2011-07-21 20:00 ` [Qemu-devel] [PATCH 05/25] qlist: add qlist_first()/qlist_next() Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 06/25] qapi: add module init types for qapi Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 07/25] qapi: add QAPI visitor core Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 08/25] qapi: add QMP input visitor Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 09/25] qapi: add QMP output visitor Luiz Capitulino
2011-07-21 20:00 ` [Qemu-devel] [PATCH 10/25] qapi: add QAPI dealloc visitor Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 11/25] qapi: add QMP command registration/lookup functions Luiz Capitulino
2011-07-21 20:01 ` Luiz Capitulino [this message]
2011-07-21 20:01 ` [Qemu-devel] [PATCH 13/25] qapi: add ordereddict.py helper library Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 14/25] qapi: add qapi.py helper libraries Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 15/25] qapi: add qapi-types.py code generator Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 16/25] qapi: add qapi-visit.py " Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 17/25] qapi: add qapi-commands.py " Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 18/25] qapi: test schema used for unit tests Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 19/25] qapi: add test-visitor, tests for gen. visitor code Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 20/25] qapi: add test-qmp-commands, tests for gen. marshalling/dispatch code Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 21/25] qapi: add QAPI code generation documentation Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 22/25] qerror: add QERR_JSON_PARSE_ERROR to qerror.c Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 23/25] guest agent: command state class Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 24/25] guest agent: qemu-ga daemon Luiz Capitulino
2011-07-21 20:01 ` [Qemu-devel] [PATCH 25/25] guest agent: add guest agent RPCs/commands Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311278474-24336-13-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=lcapitulino@gmail.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).