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=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT 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 C42ABC2BCA1 for ; Fri, 7 Jun 2019 15:23:22 +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 A0CEF2089E for ; Fri, 7 Jun 2019 15:23:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0CEF2089E 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]:48730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZGi9-0004nX-Th for qemu-devel@archiver.kernel.org; Fri, 07 Jun 2019 11:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55888) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFo5-0000uW-9J for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZFo3-0006I7-Aa for qemu-devel@nongnu.org; Fri, 07 Jun 2019 10:25:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53488) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZFnx-0006CT-H7; Fri, 07 Jun 2019 10:25:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DDBE3079B81; Fri, 7 Jun 2019 14:25:16 +0000 (UTC) Received: from dhcp-200-226.str.redhat.com (dhcp-200-226.str.redhat.com [10.33.200.226]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5974660624; Fri, 7 Jun 2019 14:25:15 +0000 (UTC) Date: Fri, 7 Jun 2019 16:25:14 +0200 From: Kevin Wolf To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Message-ID: <20190607142514.GE5055@dhcp-200-226.str.redhat.com> References: <20190607135430.22149-1-kwolf@redhat.com> <20190607140357.GK28838@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20190607140357.GK28838@redhat.com> User-Agent: Mutt/1.11.3 (2019-02-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 07 Jun 2019 14:25:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [RFC PATCH 00/10] monitor: Split monitor.c in core/HMP/QMP/misc 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: dgilbert@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, armbru@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 07.06.2019 um 16:03 hat Daniel P. Berrang=E9 geschrieben: > On Fri, Jun 07, 2019 at 03:54:20PM +0200, Kevin Wolf wrote: > > monitor.c mixes a lot of different things in a single file: The core > > monitor infrastructure, HMP infrastrcture, QMP infrastructure, and th= e > > implementation of several HMP and QMP commands. Almost worse, struct > > Monitor mixes state for HMP, for QMP, and state actually shared betwe= en > > all monitors. monitor.c must be linked with a system emulator and eve= n > > requires per-target compilation because some of the commands it > > implements access system emulator state. > >=20 > > The reason why I care about this is that I'm working on a protoype fo= r a > > storage daemon, which wants to use QMP (but probably not HMP) and > > obviously doesn't have any system emulator state. So I'm interested i= n > > some core monitor parts that can be linked to non-system-emulator too= ls. > >=20 > > This series first creates separate structs MonitorQMP and MonitorHMP > > which inherit from Monitor, and then moves the associated infrastruct= ure > > code into separate source files. > >=20 > > While the split is probably not perfect, I think it's an improvement = of > > the current state even for QEMU proper, and it's good enough so I can > > link my storage daemon against just monitor/core.o and monitor/qmp.o = and > > get a useless QMP monitor that parses the JSON input and rejects > > everything as an unknown command. > >=20 > > Next I'll try to teach it a subset of QMP commands that can actually = be > > supported in a tool, but while there will be a few follow-up patches = to > > achieve this, I don't expect that this work will bring up much that > > needs to be changed in the splitting process done in this series. > >=20 > > Kevin Wolf (10): > > monitor: Remove unused password prompting fields > > monitor: Split monitor_init in HMP and QMP function > > monitor: Make MonitorQMP a child class of Monitor > > monitor: Create MonitorHMP with readline state > > monitor: Move cmd_table to MonitorHMP > > Move monitor.c to monitor/misc.c > > monitor: Create monitor_int.h with common definitions > > monitor: Split out monitor/qmp.c > > monitor: Split out monitor/hmp.c > > monitor: Split out monitor/core.c > >=20 > > include/monitor/monitor.h | 8 +- > > monitor/monitor_int.h | 207 ++ > > hmp.c | 4 +- > > monitor.c | 4727 -----------------------------------= -- > > monitor/core.c | 604 +++++ > > monitor/hmp.c | 1351 +++++++++++ > > monitor/misc.c | 2406 +++++++++++++++++++ > > monitor/qmp.c | 404 ++++ > > Makefile.objs | 1 + > > Makefile.target | 3 +- > > monitor/Makefile.objs | 2 + >=20 > It will be nice to have the monitor code split up a bit more. >=20 > I'm not a fan, however, of having both $ROOT/qmp.c and $ROOT/monitor/qm= p.c > Likwise $ROOT/hmp.c and $ROOT/monitor/hmp.c. Can we move those other > existing files out of the root dir, into monitor/, so we don't have two > files with the same name in different dirs. $ROOT/hmp.c and $ROOT/qmp.c contain various command implementations, just as $ROOT/monitor/misc.c. This is still a bit of a mess. I'll have to address this at least partially in the next step because I need to separate commands that can be linked with tools from those that require a system emulator. My plan involves at least creating some monitor/qmp-cmds-*.c, which might already make $ROOT/qmp.c empty. Even though I don't strictly need it, there's no reason not to do the same for HMP, too. In any case, I'd rather address this in a separate follow-up series. But if people prefer, I can move the existing files in the root directory to monitor/{qmp,hmp}-cmds.c temporarily in this series and then work from there with follow-ups until they are empty (or maybe I don't even have to make them completely empty then). Kevin