From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com,
Jes.Sorensen@redhat.com, mdroth@linux.vnet.ibm.com,
markus_mueller@de.ibm.com, aliguori@linux.vnet.ibm.com,
abeekhof@redhat.com
Subject: [Qemu-devel] [RFC][PATCH v7 08/16] virtagnet: base RPC server definitions
Date: Mon, 7 Mar 2011 14:10:34 -0600 [thread overview]
Message-ID: <1299528642-23631-9-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1299528642-23631-1-git-send-email-mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
virtagent-server.c | 313 ++++++++++++++++++++++++++++++++++++++++++++++++++++
virtagent-server.h | 40 +++++++
2 files changed, 353 insertions(+), 0 deletions(-)
create mode 100644 virtagent-server.c
create mode 100644 virtagent-server.h
diff --git a/virtagent-server.c b/virtagent-server.c
new file mode 100644
index 0000000..f84546b
--- /dev/null
+++ b/virtagent-server.c
@@ -0,0 +1,313 @@
+/*
+ * virtagent - host/guest RPC server functions
+ *
+ * Copyright IBM Corp. 2010
+ *
+ * Authors:
+ * Adam Litke <aglitke@linux.vnet.ibm.com>
+ * Michael Roth <mdroth@linux.vnet.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+#include <syslog.h>
+#include "virtagent-common.h"
+#include "qemu_socket.h"
+#include "qjson.h"
+#include "qint.h"
+
+static VARPCFunction guest_functions[];
+static VARPCFunction host_functions[];
+static VAServerData *va_server_data;
+static bool va_enable_syslog = false; /* enable syslog'ing of RPCs */
+
+#define SLOG(msg, ...) do { \
+ char msg_buf[1024]; \
+ if (!va_enable_syslog) { \
+ break; \
+ } \
+ snprintf(msg_buf, 1024, msg, ## __VA_ARGS__); \
+ syslog(LOG_INFO, "virtagent, %s", msg_buf); \
+} while(0)
+
+/* helper functions for RPCs */
+
+static QDict *va_server_format_response(QDict *return_data, int errnum,
+ const char *errstr)
+{
+ QDict *response = qdict_new();
+
+ if (errnum == -1) {
+ if (!errstr) {
+ errstr = "unknown remote error handling RPC";
+ }
+ }
+ if (errstr) {
+ qdict_put_obj(response, "errstr",
+ QOBJECT(qstring_from_str(errstr)));
+ }
+ qdict_put_obj(response, "errnum", QOBJECT(qint_from_int(errnum)));
+ if (return_data) {
+ qdict_put_obj(response, "return_data", QOBJECT(return_data));
+ }
+
+ return response;
+}
+
+/* RPCs */
+
+/* va_hello(): handle client startup notification
+ * params/response qdict format (*=optional):
+ * response{error}: <error code>
+ * response{errstr}: <error description>
+ */
+static QDict *va_hello(const QDict *params)
+{
+ int ret;
+ TRACE("called");
+ SLOG("va_hello()");
+ ret = va_client_init_capabilities();
+ if (ret < 0) {
+ LOG("error setting initializing client capabilities");
+ }
+ return va_server_format_response(NULL, 0, NULL);
+}
+
+/* va_capabilities(): return server capabilities
+ * params/response qdict format (*=optional):
+ * response{error}: <error code>
+ * response{errstr}: <error description>
+ * response{return_data}{methods}: list of callable RPCs
+ * response{return_data}{version}: virtagent version
+ */
+static QDict *va_capabilities(const QDict *params)
+{
+ QList *functions = qlist_new();
+ QDict *ret = qdict_new();
+ int i;
+ const char *func_name;
+
+ TRACE("called");
+ SLOG("va_capabilities()");
+
+ for (i = 0; va_server_data->functions[i].func != NULL; ++i) {
+ func_name = va_server_data->functions[i].func_name;
+ qlist_append_obj(functions, QOBJECT(qstring_from_str(func_name)));
+ }
+ qdict_put_obj(ret, "methods", QOBJECT(functions));
+ qdict_put_obj(ret, "version", QOBJECT(qstring_from_str(VA_VERSION)));
+
+ return va_server_format_response(ret, 0, NULL);
+}
+
+static VARPCFunction guest_functions[] = {
+ { .func = va_capabilities,
+ .func_name = "capabilities" },
+ { NULL, NULL }
+};
+
+static VARPCFunction host_functions[] = {
+ { .func = va_hello,
+ .func_name = "hello" },
+ { NULL, NULL }
+};
+
+static bool va_server_is_enabled(void)
+{
+ return va_server_data && va_server_data->enabled;
+}
+
+typedef struct VARequestData {
+ QDict *request;
+ QString *response;
+} VARequestData;
+
+static int va_do_server_rpc(VARequestData *d, const char *tag)
+{
+ int ret = 0, i;
+ const char *func_name;
+ VARPCFunction *func_list = va_server_data->is_host ?
+ host_functions : guest_functions;
+ QDict *response = NULL, *params = NULL;
+ bool found;
+
+ TRACE("called");
+
+ if (!va_server_is_enabled()) {
+ ret = -EBUSY;
+ goto out;
+ }
+
+ if (!d->request) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ if (!va_qdict_haskey_with_type(d->request, "method", QTYPE_QSTRING)) {
+ ret = -EINVAL;
+ va_server_job_cancel(va_server_data->manager, tag);
+ goto out;
+ }
+ func_name = qdict_get_str(d->request, "method");
+ for (i = 0; func_list[i].func != NULL; ++i) {
+ if (strcmp(func_name, func_list[i].func_name) == 0) {
+ if (va_qdict_haskey_with_type(d->request, "params", QTYPE_QDICT)) {
+ params = qdict_get_qdict(d->request, "params");
+ }
+ response = func_list[i].func(params);
+ found = true;
+ break;
+ }
+ }
+
+ if (!response) {
+ if (found) {
+ response = va_server_format_response(NULL, -1,
+ "error executing rpc");
+ } else {
+ response = va_server_format_response(NULL, -1,
+ "unsupported rpc specified");
+ }
+ }
+ /* TODO: store the json rather than the QDict that generates it */
+ d->response = qobject_to_json(QOBJECT(response));
+ if (!d->response) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ va_server_job_execute_done(va_server_data->manager, tag);
+
+out:
+ return ret;
+}
+
+int va_server_init(VAManager *m, VAServerData *server_data, bool is_host)
+{
+ va_enable_syslog = !is_host; /* enable logging for guest agent */
+ server_data->functions = is_host ? host_functions : guest_functions;
+ server_data->enabled = true;
+ server_data->is_host = is_host;
+ server_data->manager = m;
+ va_server_data = server_data;
+
+ return 0;
+}
+
+int va_server_close(void)
+{
+ if (va_server_data != NULL) {
+ va_server_data = NULL;
+ }
+ return 0;
+}
+
+/* called by VAManager to start executing the RPC */
+static int va_execute(void *opaque, const char *tag)
+{
+ VARequestData *d = opaque;
+ int ret = va_do_server_rpc(d, tag);
+ if (ret < 0) {
+ LOG("error occurred executing RPC: %s", strerror(-ret));
+ }
+
+ return ret;
+}
+
+/* called by xport layer to indicate send completion to VAManager */
+static void va_send_response_cb(const void *opaque)
+{
+ const char *tag = opaque;
+ va_server_job_send_done(va_server_data->manager, tag);
+}
+
+/* called by VAManager to start send, in turn calls out to xport layer */
+static int va_send_response(void *opaque, const char *tag)
+{
+ VARequestData *d = opaque;
+ const char *json_resp;
+ int ret;
+
+ TRACE("called, request data d: %p", opaque);
+ if (!d->response) {
+ LOG("server generated null response");
+ ret = -EINVAL;
+ goto out_cancel;
+ }
+ json_resp = qstring_get_str(d->response);
+ if (!json_resp) {
+ ret = -EINVAL;
+ LOG("server generated invalid JSON response");
+ goto out_cancel;
+ }
+
+ ret = va_xport_send_response(json_resp, strlen(json_resp),
+ tag, tag, va_send_response_cb);
+ return ret;
+out_cancel:
+ va_server_job_cancel(va_server_data->manager, tag);
+ return ret;
+}
+
+static int va_cleanup(void *opaque, const char *tag)
+{
+ VARequestData *d = opaque;
+ if (d) {
+ if (d->request) {
+ QDECREF(d->request);
+ }
+ if (d->response) {
+ QDECREF(d->response);
+ }
+ qemu_free(d);
+ }
+ return 0;
+}
+
+static VAServerJobOps server_job_ops = {
+ .execute = va_execute,
+ .send = va_send_response,
+ .callback = va_cleanup,
+};
+
+/* create server jobs from requests read from xport layer */
+int va_server_job_create(const char *content, size_t content_len, const char *tag)
+{
+ VARequestData *d = qemu_mallocz(sizeof(VAServerData));
+ QObject *request_obj;
+
+ if (!content) {
+ LOG("recieved job with null request string");
+ goto out_bad;
+ }
+
+ request_obj = qobject_from_json(content);
+ if (!request_obj) {
+ LOG("unable to parse JSON arguments");
+ goto out_bad;
+ }
+
+ d->request = qobject_to_qdict(request_obj);
+ if (!d->request) {
+ LOG("recieved qobject of unexpected type: %d",
+ qobject_type(request_obj));
+ goto out_bad_free;
+ }
+
+ if (!va_qdict_haskey_with_type(d->request, "method", QTYPE_QSTRING)) {
+ LOG("RPC command not specified");
+ goto out_bad_free;
+ }
+
+ va_server_job_add(va_server_data->manager, tag, d, server_job_ops);
+
+ return 0;
+out_bad_free:
+ if (d->request) {
+ QDECREF(d->request);
+ }
+ qemu_free(d);
+out_bad:
+ return -EINVAL;
+}
diff --git a/virtagent-server.h b/virtagent-server.h
new file mode 100644
index 0000000..1f27577
--- /dev/null
+++ b/virtagent-server.h
@@ -0,0 +1,40 @@
+/*
+ * virt-agent - host/guest RPC daemon functions
+ *
+ * Copyright IBM Corp. 2010
+ *
+ * Authors:
+ * Michael Roth <mdroth@linux.vnet.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "virtagent-manager.h"
+#include "qdict.h"
+
+#define GUEST_AGENT_SERVICE_ID "virtagent"
+#define GUEST_AGENT_PATH "/tmp/virtagent-guest.sock"
+#define HOST_AGENT_SERVICE_ID "virtagent-host"
+#define HOST_AGENT_PATH "/tmp/virtagent-host.sock"
+#define VA_GETFILE_MAX 1 << 30
+#define VA_FILEBUF_LEN 16384
+#define VA_DMESG_LEN 16384
+
+typedef struct VARPCFunction {
+ QDict *(*func)(const QDict *params);
+ const char *func_name;
+} VARPCFunction;
+
+typedef struct VAServerData {
+ bool enabled;
+ bool is_host;
+ VARPCFunction *functions;
+ VAManager *manager;
+} VAServerData;
+
+int va_server_init(VAManager *m, VAServerData *server_data, bool is_host);
+int va_server_close(void);
+//int va_do_server_rpc(const char *content, size_t content_len, const char tag[64]);
+int va_server_job_create(const char *content, size_t content_len, const char *tag);
--
1.7.0.4
next prev parent reply other threads:[~2011-03-07 20:11 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 20:10 [Qemu-devel] [RFC][PATCH v7 00/16] virtagent: host/guest communication agent Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 01/16] Move code related to fd handlers into utility functions Michael Roth
2011-03-09 13:58 ` [Qemu-devel] " Paolo Bonzini
2011-03-09 14:11 ` Michael Roth
2011-03-09 14:38 ` Paolo Bonzini
2011-03-09 15:01 ` Michael Roth
2011-03-09 15:15 ` Paolo Bonzini
2011-03-09 14:28 ` Anthony Liguori
2011-03-09 14:40 ` Anthony Liguori
2011-03-09 14:45 ` Paolo Bonzini
2011-03-09 15:39 ` Anthony Liguori
2011-03-09 14:09 ` Paolo Bonzini
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 02/16] Add qemu_set_fd_handler() wrappers to qemu-tools.c Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 03/16] Make qemu timers available for tools Michael Roth
2011-03-09 10:33 ` [Qemu-devel] " Jes Sorensen
2011-03-09 13:04 ` Michael Roth
2011-03-09 13:06 ` Jes Sorensen
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 04/16] virtagent: bi-directional RPC handling logic Michael Roth
2011-03-07 21:24 ` [Qemu-devel] " Adam Litke
2011-03-07 22:35 ` Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 05/16] virtagent: common helpers and init routines Michael Roth
2011-03-09 10:38 ` [Qemu-devel] " Jes Sorensen
2011-03-09 13:17 ` Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 06/16] virtagent: transport definitions Michael Roth
2011-03-07 21:38 ` [Qemu-devel] " Adam Litke
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 07/16] virtagent: base RPC client definitions Michael Roth
2011-03-07 20:10 ` Michael Roth [this message]
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 09/16] virtagent: add va_capabilities HMP/QMP command Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 10/16] virtagent: add "ping" RPC to server Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 11/16] virtagent: add va_ping HMP/QMP command Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 12/16] virtagent: add "shutdown" RPC to server Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 13/16] virtagent: add va_shutdown HMP/QMP command Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 14/16] virtagent: add virtagent chardev Michael Roth
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 15/16] virtagent: qemu-va, system-level virtagent guest agent Michael Roth
2011-03-09 10:48 ` [Qemu-devel] " Jes Sorensen
2011-03-07 20:10 ` [Qemu-devel] [RFC][PATCH v7 16/16] virtagent: add bits to build virtagent host/guest components Michael Roth
2011-03-07 21:43 ` [Qemu-devel] Re: [RFC][PATCH v7 00/16] virtagent: host/guest communication agent Anthony Liguori
2011-03-07 22:49 ` Michael Roth
2011-03-07 22:56 ` Anthony Liguori
2011-03-08 0:11 ` Michael Roth
2011-03-08 0:24 ` Anthony Liguori
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=1299528642-23631-9-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=Jes.Sorensen@redhat.com \
--cc=abeekhof@redhat.com \
--cc=agl@linux.vnet.ibm.com \
--cc=aliguori@linux.vnet.ibm.com \
--cc=markus_mueller@de.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.com \
/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).