From patchwork Thu Nov 19 15:13:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38848 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 C2194B6F2B for ; Fri, 20 Nov 2009 02:31:12 +1100 (EST) Received: from localhost ([127.0.0.1]:33790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NB8yT-0000Px-Ku for incoming@patchwork.ozlabs.org; Thu, 19 Nov 2009 10:31:09 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NB8i0-0007bc-BN for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NB8hv-0007XC-Ar for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:07 -0500 Received: from [199.232.76.173] (port=49915 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NB8hv-0007Wx-2P for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28715) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NB8hu-00024L-BE for qemu-devel@nongnu.org; Thu, 19 Nov 2009 10:14:02 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAJFE1YM009307 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Nov 2009 10:14:01 -0500 Received: from localhost (vpn-9-45.rdu.redhat.com [10.11.9.45]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAJFE0Gr009512; Thu, 19 Nov 2009 10:14:00 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 19 Nov 2009 13:13:33 -0200 Message-Id: <1258643623-8636-6-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.12 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 05/15] QMP: chardev handling 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 This patch adds initial QMP support in QEMU. It's important to notice that most QMP code will be part of the Monitor. Input will be handled by monitor_control_read(). Currently it reads the input and discards it, next patches add proper input support. The function monitor_json_emitter(), as its name implies, is used by the Monitor to emit JSON output. In this commit it's used by monitor_control_event() to print our greeting message. Finally, control mode support is also added to monitor_init(), allowing QMP to be really enabled. Signed-off-by: Luiz Capitulino --- monitor.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 07bd21c..be68dd5 100644 --- a/monitor.c +++ b/monitor.c @@ -50,6 +50,7 @@ #include "qdict.h" #include "qstring.h" #include "qerror.h" +#include "qjson.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -92,6 +93,11 @@ struct mon_fd_t { QLIST_ENTRY(mon_fd_t) next; }; +typedef struct MonitorControl { + uint8_t buf[1024]; + int size; +} MonitorControl; + struct Monitor { CharDriverState *chr; int mux_out; @@ -101,6 +107,7 @@ struct Monitor { uint8_t outbuf[1024]; int outbuf_index; ReadLineState *rs; + MonitorControl *mc; CPUState *mon_cpu; BlockDriverCompletionFunc *password_completion_cb; void *password_opaque; @@ -255,6 +262,17 @@ static void monitor_print_qobject(Monitor *mon, const QObject *data) monitor_puts(mon, "\n"); } +static void monitor_json_emitter(Monitor *mon, const QObject *data) +{ + QString *json; + + json = qobject_to_json(data); + assert(json != NULL); + + monitor_printf(mon, "%s\n", qstring_get_str(json)); + QDECREF(json); +} + static int compare_cmd(const char *name, const char *list) { const char *p, *pstart; @@ -3530,6 +3548,37 @@ static int monitor_can_read(void *opaque) return (mon->suspend_cnt == 0) ? 128 : 0; } +/** + * monitor_control_read(): Read and handle QMP input + */ +static void monitor_control_read(void *opaque, const uint8_t *buf, int size) +{ + Monitor *old_mon = cur_mon; + int i; + + cur_mon = opaque; + + for (i = 0; i < size; i++) { + if (buf[i] == '\r' || buf[i] == '\n') { + cur_mon->mc->buf[cur_mon->mc->size] = '\0'; + cur_mon->mc->size = 0; + + /* TODO: parse QMP input */ + break; + } else { + cur_mon->mc->buf[cur_mon->mc->size++] = buf[i]; + if (cur_mon->mc->size == sizeof(cur_mon->mc->buf)) { + /* FIXME: qemu_error_new() */ + monitor_printf(cur_mon, "Command too long\n"); + cur_mon->mc->size = 0; + break; + } + } + } + + cur_mon = old_mon; +} + static void monitor_read(void *opaque, const uint8_t *buf, int size) { Monitor *old_mon = cur_mon; @@ -3573,6 +3622,24 @@ void monitor_resume(Monitor *mon) readline_show_prompt(mon->rs); } +/** + * monitor_control_event(): Print QMP gretting on RESET + */ +static void monitor_control_event(void *opaque, int event) +{ + if (event == CHR_EVENT_OPENED) { + QObject *data; + Monitor *mon = opaque; + + data = qobject_from_jsonf("{ 'QMP': { 'capabilities': [] } }"); + assert(data != NULL); + monitor_json_emitter(mon, data); + qobject_decref(data); + + mon->mc->size = 0; + } +} + static void monitor_event(void *opaque, int event) { Monitor *mon = opaque; @@ -3659,8 +3726,15 @@ void monitor_init(CharDriverState *chr, int flags) monitor_read_command(mon, 0); } - qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, monitor_event, - mon); + if (monitor_ctrl_mode(mon)) { + mon->mc = qemu_mallocz(sizeof(MonitorControl)); + /* Control mode requires special handlers */ + qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read, + monitor_control_event, mon); + } else { + qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, + monitor_event, mon); + } QLIST_INSERT_HEAD(&mon_list, mon, entry); if (!cur_mon || (flags & MONITOR_IS_DEFAULT))