From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5D5CECE58E for ; Thu, 17 Oct 2019 13:11:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7976A20640 for ; Thu, 17 Oct 2019 13:11:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7976A20640 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5Yr-0001m2-Lu for qemu-devel@archiver.kernel.org; Thu, 17 Oct 2019 09:11:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60060) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iL5SB-0000ol-V4 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iL5SA-0008Uk-Gm for qemu-devel@nongnu.org; Thu, 17 Oct 2019 09:04:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iL5S7-0008SW-Br; Thu, 17 Oct 2019 09:04:27 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93D5910F14; Thu, 17 Oct 2019 13:04:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-24.ams2.redhat.com [10.36.117.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE641000232; Thu, 17 Oct 2019 13:04:24 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [RFC PATCH 11/18] monitor: Move monitor option parsing to monitor/monitor.c Date: Thu, 17 Oct 2019 15:01:57 +0200 Message-Id: <20191017130204.16131-12-kwolf@redhat.com> In-Reply-To: <20191017130204.16131-1-kwolf@redhat.com> References: <20191017130204.16131-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 17 Oct 2019 13:04:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Both the system emulators and the storage daemon will need to parse monitor options, so move that code to monitor/monitor.c, which can be linked into binaries that aren't a system emulator. This patch moves the monitor option parsing from vl.c and adds an allow_hmp parameter so that callers can support QMP without HMP. Signed-off-by: Kevin Wolf --- include/monitor/monitor.h | 4 +++ include/sysemu/sysemu.h | 1 - monitor/monitor.c | 52 +++++++++++++++++++++++++++++++++++++++ vl.c | 45 +-------------------------------- 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index a81eeff5f8..d3e8da36a5 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -3,6 +3,7 @@ =20 #include "block/block.h" #include "qapi/qapi-types-misc.h" +#include "qemu/option.h" #include "qemu/readline.h" =20 extern __thread Monitor *cur_mon; @@ -10,12 +11,15 @@ typedef struct MonitorHMP MonitorHMP; =20 #define QMP_REQ_QUEUE_LEN_MAX 8 =20 +extern QemuOptsList qemu_mon_opts; + bool monitor_cur_is_qmp(void); =20 void monitor_init_globals(void); void monitor_init_globals_core(void); void monitor_init_qmp(Chardev *chr, bool pretty); void monitor_init_hmp(Chardev *chr, bool use_readline); +int monitor_init_opts(QemuOpts *opts, bool allow_hmp, Error **errp); void monitor_cleanup(void); =20 int monitor_suspend(Monitor *mon); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 44f18eb739..e54934c311 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -124,7 +124,6 @@ extern QemuOptsList qemu_netdev_opts; extern QemuOptsList qemu_nic_opts; extern QemuOptsList qemu_net_opts; extern QemuOptsList qemu_global_opts; -extern QemuOptsList qemu_mon_opts; extern QemuOptsList qemu_semihosting_config_opts; =20 #endif diff --git a/monitor/monitor.c b/monitor/monitor.c index 12898b6448..316b71b928 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -609,6 +609,58 @@ void monitor_init_globals_core(void) NULL); } =20 +int monitor_init_opts(QemuOpts *opts, bool allow_hmp, Error **errp) +{ + Chardev *chr; + bool qmp; + bool pretty =3D false; + const char *chardev; + const char *mode; + + mode =3D qemu_opt_get(opts, "mode"); + if (mode =3D=3D NULL) { + mode =3D allow_hmp ? "readline" : "control"; + } + if (strcmp(mode, "readline") =3D=3D 0) { + qmp =3D false; + } else if (strcmp(mode, "control") =3D=3D 0) { + qmp =3D true; + } else { + error_setg(errp, "unknown monitor mode \"%s\"", mode); + return -1; + } + if (!allow_hmp && !qmp) { + error_setg(errp, "Only QMP is supported"); + return -1; + } + + if (!qmp && qemu_opt_get(opts, "pretty")) { + warn_report("'pretty' is deprecated for HMP monitors, it has no = effect " + "and will be removed in future versions"); + } + if (qemu_opt_get_bool(opts, "pretty", 0)) { + pretty =3D true; + } + + chardev =3D qemu_opt_get(opts, "chardev"); + if (!chardev) { + error_report("chardev is required"); + exit(1); + } + chr =3D qemu_chr_find(chardev); + if (chr =3D=3D NULL) { + error_setg(errp, "chardev \"%s\" not found", chardev); + return -1; + } + + if (qmp) { + monitor_init_qmp(chr, pretty); + } else { + monitor_init_hmp(chr, true); + } + return 0; +} + QemuOptsList qemu_mon_opts =3D { .name =3D "mon", .implied_opt_name =3D "chardev", diff --git a/vl.c b/vl.c index 4489cfb2bb..e9d9a44acf 100644 --- a/vl.c +++ b/vl.c @@ -2234,50 +2234,7 @@ static int fsdev_init_func(void *opaque, QemuOpts = *opts, Error **errp) =20 static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp) { - Chardev *chr; - bool qmp; - bool pretty =3D false; - const char *chardev; - const char *mode; - - mode =3D qemu_opt_get(opts, "mode"); - if (mode =3D=3D NULL) { - mode =3D "readline"; - } - if (strcmp(mode, "readline") =3D=3D 0) { - qmp =3D false; - } else if (strcmp(mode, "control") =3D=3D 0) { - qmp =3D true; - } else { - error_setg(errp, "unknown monitor mode \"%s\"", mode); - return -1; - } - - if (!qmp && qemu_opt_get(opts, "pretty")) { - warn_report("'pretty' is deprecated for HMP monitors, it has no = effect " - "and will be removed in future versions"); - } - if (qemu_opt_get_bool(opts, "pretty", 0)) { - pretty =3D true; - } - - chardev =3D qemu_opt_get(opts, "chardev"); - if (!chardev) { - error_report("chardev is required"); - exit(1); - } - chr =3D qemu_chr_find(chardev); - if (chr =3D=3D NULL) { - error_setg(errp, "chardev \"%s\" not found", chardev); - return -1; - } - - if (qmp) { - monitor_init_qmp(chr, pretty); - } else { - monitor_init_hmp(chr, true); - } - return 0; + return monitor_init_opts(opts, true, errp); } =20 static void monitor_parse(const char *optarg, const char *mode, bool pre= tty) --=20 2.20.1