From patchwork Thu Nov 19 15:13:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74AD81007D1 for ; Fri, 20 Nov 2009 02:33:17 +1100 (EST) Received: from localhost ([127.0.0.1]:34154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NB90T-0002cM-Um for incoming@patchwork.ozlabs.org; Thu, 19 Nov 2009 10:33:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NB8i2-0007cW-5v for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:10 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NB8hy-0007ZM-2P for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:09 -0500 Received: from [199.232.76.173] (port=49916 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NB8hx-0007YU-1H for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34754) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NB8hw-00025L-9x for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:04 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAJFE3Qh011536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Nov 2009 10:14:03 -0500 Received: from localhost (vpn-9-45.rdu.redhat.com [10.11.9.45]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAJFE25t017528; Thu, 19 Nov 2009 10:14:02 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 19 Nov 2009 13:13:34 -0200 Message-Id: <1258643623-8636-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1258643623-8636-1-git-send-email-lcapitulino@redhat.com> References: <1258643623-8636-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 06/15] QMP: Output support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In the new Monitor, output is always done by only two functions: do_info() and monitor_call_handler(). To support QMP output, we modify those functions to test if we are in control mode. If so, we call monitor_protocol_emitter() to emit QMP output, otherwise we do regular output. QMP has two types of responses to issued commands: success and error. The outputed data is always a JSON object. Success responses have the following format: { "return": json-value, "id": json-value } Error responses have the following format: { "error": { "class": json-string, "desc": json-string, "data": json-value } "id": json-value } Please, note that the "id" key is part of the input code, and thus is not added in this commit. Signed-off-by: Luiz Capitulino --- monitor.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 7 deletions(-) diff --git a/monitor.c b/monitor.c index be68dd5..e81f9e6 100644 --- a/monitor.c +++ b/monitor.c @@ -273,6 +273,33 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data) QDECREF(json); } +static void monitor_protocol_emitter(Monitor *mon, QObject *data) +{ + QDict *qmp; + + qmp = qdict_new(); + + if (!monitor_has_error(mon)) { + /* success response */ + if (data) { + qobject_incref(data); + qdict_put_obj(qmp, "return", data); + } else { + // FIXME: should we return json-null here? + qdict_put(qmp, "return", qstring_from_str("OK")); + } + } else { + /* error response */ + QINCREF(mon->error->error); + qdict_put(qmp, "error", mon->error->error); + QDECREF(mon->error); + mon->error = NULL; + } + + monitor_json_emitter(mon, QOBJECT(qmp)); + QDECREF(qmp); +} + static int compare_cmd(const char *name, const char *list) { const char *p, *pstart; @@ -360,8 +387,15 @@ static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) if (monitor_handler_ported(cmd)) { cmd->mhandler.info_new(mon, ret_data); - if (*ret_data) - cmd->user_print(mon, *ret_data); + + if (!monitor_ctrl_mode(mon)) { + /* + * User Protocol function is called here, Monitor Protocol is + * handled by monitor_handle_command() + */ + if (*ret_data) + cmd->user_print(mon, *ret_data); + } } else { cmd->mhandler.info(mon); } @@ -3292,8 +3326,15 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, QObject *data = NULL; cmd->mhandler.cmd_new(mon, params, &data); - if (data) - cmd->user_print(mon, data); + + if (monitor_ctrl_mode(mon)) { + /* Monitor Protocol */ + monitor_protocol_emitter(mon, data); + } else { + /* User Protocol */ + if (data) + cmd->user_print(mon, data); + } qobject_decref(data); } @@ -3315,10 +3356,11 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) monitor_call_handler(mon, cmd, qdict); } else { cmd->mhandler.cmd(mon, qdict); - } - if (monitor_has_error(mon)) - monitor_print_error(mon); + if (monitor_has_error(mon)) { + monitor_print_error(mon); + } + } qemu_errors_to_previous();