qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Adam Litke <aglitke@linux.vnet.ibm.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Markus Armbruster <armbru@redhat.com>,
	Luiz Capitulino <lcapitulino@redhat.com>
Subject: [Qemu-devel] [PATCH 10/22] qapi: add core QMP server support
Date: Sun,  6 Mar 2011 19:22:52 -0600	[thread overview]
Message-ID: <1299460984-15849-11-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com>

This is the infrastructure to register commands.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile.objs b/Makefile.objs
index f51eab3..dbdce3c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -103,6 +103,7 @@ common-obj-y += block-migration.o
 common-obj-y += pflib.o
 common-obj-y += bitmap.o bitops.o
 common-obj-y += qmp-marshal-types.o qmp-marshal-types-core.o
+common-obj-y += qmp-core.o
 
 common-obj-$(CONFIG_BRLAPI) += baum.o
 common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
diff --git a/qmp-core.c b/qmp-core.c
new file mode 100644
index 0000000..78aef3a
--- /dev/null
+++ b/qmp-core.c
@@ -0,0 +1,77 @@
+/*
+ * QAPI
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ *  Anthony Liguori   <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.  See
+ * the COPYING.LIB file in the top-level directory.
+ */
+#include "qmp.h"
+#include "qmp-core.h"
+#include "json-lexer.h"
+#include "json-parser.h"
+#include "json-streamer.h"
+#include "qemu_socket.h"
+#include <glib.h>
+#include "qemu-queue.h"
+#include "sysemu.h"
+
+typedef struct QmpCommand
+{
+    const char *name;
+    bool stateful;
+    QmpCommandFunc *fn;
+    QmpStatefulCommandFunc *sfn;
+    QTAILQ_ENTRY(QmpCommand) node;
+} QmpCommand;
+
+static QTAILQ_HEAD(, QmpCommand) qmp_commands =
+    QTAILQ_HEAD_INITIALIZER(qmp_commands);
+
+void qmp_register_command(const char *name, QmpCommandFunc *fn)
+{
+    QmpCommand *cmd = qemu_mallocz(sizeof(*cmd));
+
+    cmd->name = name;
+    cmd->stateful = false;
+    cmd->fn = fn;
+    QTAILQ_INSERT_TAIL(&qmp_commands, cmd, node);
+}
+
+void qmp_register_stateful_command(const char *name, QmpStatefulCommandFunc *fn)
+{
+    QmpCommand *cmd = qemu_mallocz(sizeof(*cmd));
+
+    cmd->name = name;
+    cmd->stateful = true;
+    cmd->sfn = fn;
+    QTAILQ_INSERT_TAIL(&qmp_commands, cmd, node);
+}
+
+char *qobject_as_string(QObject *obj)
+{
+    char buffer[1024];
+
+    switch (qobject_type(obj)) {
+    case QTYPE_QINT:
+        snprintf(buffer, sizeof(buffer), "%" PRId64,
+                 qint_get_int(qobject_to_qint(obj)));
+        return qemu_strdup(buffer);
+    case QTYPE_QSTRING:
+        return qemu_strdup(qstring_get_str(qobject_to_qstring(obj)));
+    case QTYPE_QFLOAT:
+        snprintf(buffer, sizeof(buffer), "%.17g",
+                 qfloat_get_double(qobject_to_qfloat(obj)));
+        return qemu_strdup(buffer);
+    case QTYPE_QBOOL:
+        if (qbool_get_int(qobject_to_qbool(obj))) {
+            return qemu_strdup("on");
+        }
+        return qemu_strdup("off");
+    default:
+        return NULL;
+    }
+}
diff --git a/qmp-core.h b/qmp-core.h
new file mode 100644
index 0000000..e3235ec
--- /dev/null
+++ b/qmp-core.h
@@ -0,0 +1,30 @@
+/*
+ * QAPI
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ *  Anthony Liguori   <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.  See
+ * the COPYING.LIB file in the top-level directory.
+ */
+#ifndef QMP_CORE_H
+#define QMP_CORE_H
+
+#include "monitor.h"
+#include "qmp-marshal-types.h"
+#include "error_int.h"
+
+typedef struct QmpState QmpState;
+
+typedef void (QmpCommandFunc)(const QDict *, QObject **, Error **);
+typedef void (QmpStatefulCommandFunc)(QmpState *qmp__sess, const QDict *, QObject **, Error **);
+
+void qmp_register_command(const char *name, QmpCommandFunc *fn);
+void qmp_register_stateful_command(const char *name, QmpStatefulCommandFunc *fn);
+void qmp_init_chardev(CharDriverState *chr);
+
+char *qobject_as_string(QObject *obj);
+
+#endif
-- 
1.7.0.4

  parent reply	other threads:[~2011-03-07  1:23 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07  1:22 [Qemu-devel] [PATCH 00/22] QAPI Round 1 Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 01/22] Add hard build dependency on glib Anthony Liguori
2011-03-07 10:59   ` Daniel P. Berrange
2011-03-07 13:55     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 02/22] qerror: expose a function to format an error Anthony Liguori
2011-03-07 11:14   ` Stefan Hajnoczi
2011-03-07 13:38     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 03/22] qapi: add Error object Anthony Liguori
2011-03-07 11:06   ` Daniel P. Berrange
2011-03-07 13:59     ` Anthony Liguori
2011-03-07 14:24     ` Anthony Liguori
2011-03-07 11:38   ` Stefan Hajnoczi
2011-03-07 13:36     ` Anthony Liguori
2011-03-07 13:55       ` Stefan Hajnoczi
2011-03-07  1:22 ` [Qemu-devel] [PATCH 04/22] qerror: split out the reporting bits of QError Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 05/22] qerror: add new error message for invalid enum values Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 06/22] qapi: add JSON parsing error message Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 07/22] json: propagate error from parser Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 08/22] qapi: add code generator for qmp-types Anthony Liguori
2011-03-07  1:57   ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 09/22] qapi: add code generator for type marshallers Anthony Liguori
2011-03-07  1:22 ` Anthony Liguori [this message]
2011-03-07 13:09   ` [Qemu-devel] [PATCH 10/22] qapi: add core QMP server support Stefan Hajnoczi
2011-03-07 13:39     ` Anthony Liguori
2011-03-07 13:46       ` Daniel P. Berrange
2011-03-07 13:54         ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 11/22] qapi: add signal support to core QMP server Anthony Liguori
2011-03-07 13:21   ` Stefan Hajnoczi
2011-03-07 13:53     ` Anthony Liguori
2011-03-07 14:36       ` Stefan Hajnoczi
2011-03-07 14:41         ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 12/22] qapi: add QAPI module type Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 13/22] qapi: add code generators for QMP command marshaling Anthony Liguori
2011-03-07 13:27   ` Stefan Hajnoczi
2011-03-07 13:44     ` Anthony Liguori
2011-03-07 14:38       ` Stefan Hajnoczi
2011-03-07  1:22 ` [Qemu-devel] [PATCH 14/22] qapi: add query-version QMP command Anthony Liguori
2011-03-07 13:35   ` Stefan Hajnoczi
2011-03-07 13:41     ` Anthony Liguori
2011-03-09 13:28       ` Avi Kivity
2011-03-09 13:44         ` Anthony Liguori
2011-03-09 13:51           ` Avi Kivity
2011-03-09 14:13             ` Anthony Liguori
2011-03-09 13:36   ` Avi Kivity
2011-03-09 14:11     ` Anthony Liguori
2011-03-09 14:37       ` Avi Kivity
2011-03-09 14:47         ` Anthony Liguori
2011-03-10 12:41           ` Avi Kivity
2011-03-10 12:46             ` Avi Kivity
2011-03-10 13:52             ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 15/22] qapi: add new QMP server that uses CharDriverState Anthony Liguori
2011-03-07 13:52   ` Stefan Hajnoczi
2011-03-07 14:02     ` Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 16/22] vl: add a new -qmp2 option to expose experimental QMP server Anthony Liguori
2011-03-07  1:22 ` [Qemu-devel] [PATCH 17/22] qapi: add QMP quit command Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 18/22] qapi: add QMP qmp_capabilities command Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 19/22] qapi: add QMP put-event command Anthony Liguori
2011-03-09 13:31   ` Avi Kivity
2011-03-09 13:48     ` Anthony Liguori
2011-03-09 13:58       ` Avi Kivity
2011-03-09 14:26         ` Anthony Liguori
2011-03-10 12:39           ` Avi Kivity
2011-03-10 14:12             ` Anthony Liguori
2011-03-10 14:24               ` Avi Kivity
2011-03-10 15:30                 ` Avi Kivity
2011-03-10 15:41                   ` Anthony Liguori
2011-03-10 15:49                     ` Avi Kivity
2011-03-10 16:42                       ` Anthony Liguori
2011-03-12 20:37                         ` Avi Kivity
2011-03-10 15:33                 ` Anthony Liguori
2011-03-10 15:45                   ` Avi Kivity
2011-03-10 16:04                     ` Anthony Liguori
2011-03-12 20:42                       ` Avi Kivity
2011-03-12 23:30                         ` Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 20/22] qapi: add code generator for libqmp Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 21/22] qapi: add test-libqmp Anthony Liguori
2011-03-07  1:23 ` [Qemu-devel] [PATCH 22/22] qapi: generate HTML report for test-libqmp Anthony Liguori
2011-03-07  2:11   ` Anthony Liguori
2011-03-07  1:26 ` [Qemu-devel] [PATCH] qapi: qmp-types.c and qmp-types.h Anthony Liguori
2011-03-07  1:27 ` [Qemu-devel] [PATCH] qapi: qmp-marshal-types.c and qmp-marshal-types.h Anthony Liguori
2011-03-07  1:28 ` [Qemu-devel] [PATCH] qapi: add qmp-marshal.c and qmp.h Anthony Liguori
2011-03-07  1:29 ` [Qemu-devel] [PATCH] qapi: add libqmp.c and libqmp.h Anthony Liguori
2011-03-07 15:08 ` [Qemu-devel] [PATCH 00/22] QAPI Round 1 Stefan Hajnoczi
2011-03-07 15:59   ` Anthony Liguori
2011-03-08 11:12     ` Avi Kivity
2011-03-08 13:35       ` Anthony Liguori
2011-03-08 13:45         ` Avi Kivity
2011-03-08 13:54           ` Anthony Liguori
2011-03-08 14:00             ` Avi Kivity
2011-03-08 14:10               ` Anthony Liguori
2011-03-08 14:17                 ` Avi Kivity
2011-03-08 14:20                   ` Anthony Liguori
2011-03-08 14:38                   ` Anthony Liguori
2011-03-08 14:52                     ` Avi Kivity
2011-03-08 15:03                       ` Anthony Liguori
2011-03-08 17:44                         ` Avi Kivity
2011-03-08 19:19                           ` Anthony Liguori
2011-03-09  8:51                             ` Avi Kivity
2011-03-09 13:12                               ` Anthony Liguori
2011-03-09 13:14                                 ` Avi Kivity
2011-03-09 13:51                                   ` Anthony Liguori
2011-03-09 13:55                                     ` Avi Kivity
2011-03-09 14:15                                       ` Anthony Liguori
2011-03-09 13:51                                   ` Michael Roth
2011-03-07 20:59   ` Anthony Liguori
2011-03-07 22:00     ` Stefan Hajnoczi

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=1299460984-15849-11-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=aglitke@linux.vnet.ibm.com \
    --cc=armbru@redhat.com \
    --cc=lcapitulino@redhat.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).