From patchwork Mon Mar 7 01:22:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 85624 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 DE5C5B7103 for ; Mon, 7 Mar 2011 12:36:15 +1100 (EST) Received: from localhost ([127.0.0.1]:53244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwPMj-00059P-JF for incoming@patchwork.ozlabs.org; Sun, 06 Mar 2011 20:36:05 -0500 Received: from [140.186.70.92] (port=47527 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwPAX-0007WJ-4n for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwPAV-0000Pv-15 for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:28 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:46356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwPAU-0000Pn-UR for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:26 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p270wdIt001421 for ; Sun, 6 Mar 2011 19:58:39 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id A3B8C6E8036 for ; Sun, 6 Mar 2011 20:23:26 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p271NQqc2449556 for ; Sun, 6 Mar 2011 20:23:26 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p271NPAk021131 for ; Sun, 6 Mar 2011 20:23:26 -0500 Received: from localhost.localdomain (sig-9-65-217-198.mts.ibm.com [9.65.217.198]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p271N9MX020370; Sun, 6 Mar 2011 20:23:25 -0500 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Sun, 6 Mar 2011 19:22:58 -0600 Message-Id: <1299460984-15849-17-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com> References: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.145 Cc: Adam Litke , Anthony Liguori , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH 16/22] vl: add a new -qmp2 option to expose experimental QMP server 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 is temporary until we implement all QMP commands. Signed-off-by: Anthony Liguori diff --git a/qemu-options.hx b/qemu-options.hx index badb730..957d935 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1881,6 +1881,9 @@ serial port). The default device is @code{vc} in graphical mode and @code{stdio} in non graphical mode. ETEXI +DEF("qmp2", HAS_ARG, QEMU_OPTION_qmp2, \ + "-qmp2 chardev experimental QMP server\n", + QEMU_ARCH_ALL) DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \ "-qmp dev like -monitor but opens in 'control' mode\n", QEMU_ARCH_ALL) diff --git a/vl.c b/vl.c index 68c6715..d1d0197 100644 --- a/vl.c +++ b/vl.c @@ -162,6 +162,7 @@ int main(int argc, char **argv) #include "qemu-queue.h" #include "cpus.h" #include "arch_init.h" +#include "qmp-core.h" #include "ui/qemu-spice.h" @@ -1917,6 +1918,8 @@ static const QEMUOption *lookup_opt(int argc, char **argv, return popt; } +#define MAX_QMP_CHARDEVS 16 + int main(int argc, char **argv, char **envp) { const char *gdbstub_dev = NULL; @@ -1941,6 +1944,8 @@ int main(int argc, char **argv, char **envp) const char *incoming = NULL; int show_vnc_port = 0; int defconfig = 1; + int nb_qmp_chardevs = 0; + const char *qmp_chardevs[MAX_QMP_CHARDEVS]; #ifdef CONFIG_SIMPLE_TRACE const char *trace_file = NULL; @@ -2391,6 +2396,13 @@ int main(int argc, char **argv, char **envp) monitor_parse(optarg, "control"); default_monitor = 0; break; + case QEMU_OPTION_qmp2: + if (nb_qmp_chardevs == MAX_QMP_CHARDEVS) { + fprintf(stderr, "-qmp: too many QMP chardevs\n"); + exit(1); + } + qmp_chardevs[nb_qmp_chardevs++] = optarg; + break; case QEMU_OPTION_mon: opts = qemu_opts_parse(qemu_find_opts("mon"), optarg, 1); if (!opts) { @@ -3092,6 +3104,15 @@ int main(int argc, char **argv, char **envp) } #endif + for (i = 0; i < nb_qmp_chardevs; i++) { + CharDriverState *chr = qemu_chr_find(qmp_chardevs[i]); + if (chr == NULL) { + fprintf(stderr, "-qmp: unknown chardev `%s'\n", qmp_chardevs[i]); + exit(1); + } + qmp_init_chardev(chr); + } + /* display setup */ dpy_resize(ds); dcl = ds->listeners;