[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 09/18] qapi: add QMP dispatch functions
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v5 09/18] qapi: add QMP dispatch functions |
Date: |
Tue, 5 Jul 2011 08:02:36 -0500 |
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 <address@hidden>
---
Makefile.objs | 2 +-
qapi/qmp-core.h | 1 +
qapi/qmp-dispatch.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+), 1 deletions(-)
create mode 100644 qapi/qmp-dispatch.c
diff --git a/Makefile.objs b/Makefile.objs
index 55a94e4..d7c4cec 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 99e929f..f1c26e4 100644
--- a/qapi/qmp-core.h
+++ b/qapi/qmp-core.h
@@ -35,6 +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 <address@hidden>
+ *
+ * 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.0.4
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, (continued)
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Luiz Capitulino, 2011/07/07
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Michael Roth, 2011/07/07
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Michael Roth, 2011/07/11
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Luiz Capitulino, 2011/07/12
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Michael Roth, 2011/07/12
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Luiz Capitulino, 2011/07/12
- Re: [Qemu-devel] [PATCH v5 05/18] qapi: add QMP input visitor, Michael Roth, 2011/07/12
[Qemu-devel] [PATCH v5 06/18] qapi: add QMP output visitor, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 07/18] qapi: add QAPI dealloc visitor, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 08/18] qapi: add QMP command registration/lookup functions, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 09/18] qapi: add QMP dispatch functions,
Michael Roth <=
[Qemu-devel] [PATCH v5 10/18] qapi: add ordereddict.py helper library, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 11/18] qapi: add qapi.py helper libraries, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 12/18] qapi: add qapi-types.py code generator, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 13/18] qapi: add qapi-visit.py code generator, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 14/18] qapi: add qapi-commands.py code generator, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 15/18] qapi: test schema used for unit tests, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 16/18] qapi: add test-visitor, tests for gen. visitor code, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 17/18] qapi: add test-qmp-commands, tests for gen. marshalling/dispatch code, Michael Roth, 2011/07/05
[Qemu-devel] [PATCH v5 18/18] qapi: add QAPI code generation documentation, Michael Roth, 2011/07/05
Re: [Qemu-devel] [QAPI+QGA 2/3] QAPI code generation infrastructure v5, Luiz Capitulino, 2011/07/07