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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 71D4AC2B9F4 for ; Tue, 22 Jun 2021 13:18:29 +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 1773660FE9 for ; Tue, 22 Jun 2021 13:18:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1773660FE9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvgIO-0001lS-9e for qemu-devel@archiver.kernel.org; Tue, 22 Jun 2021 09:18:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvgDj-00053K-49 for qemu-devel@nongnu.org; Tue, 22 Jun 2021 09:13:39 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:33239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvgDf-0000eG-6T for qemu-devel@nongnu.org; Tue, 22 Jun 2021 09:13:38 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-86-xJkWBc-dNVWCmaUPrhYrNQ-1; Tue, 22 Jun 2021 09:13:26 -0400 X-MC-Unique: xJkWBc-dNVWCmaUPrhYrNQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A43A100F947; Tue, 22 Jun 2021 13:13:25 +0000 (UTC) Received: from bahia.lan (ovpn-113-182.ams2.redhat.com [10.36.113.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id B37D510016FE; Tue, 22 Jun 2021 13:13:23 +0000 (UTC) Date: Tue, 22 Jun 2021 15:13:22 +0200 From: Greg Kurz To: Gerd Hoffmann Subject: Re: [PATCH 1/5] monitor: allow register hmp commands Message-ID: <20210622151322.65ca0c3e@bahia.lan> In-Reply-To: <20210622124915.261060-2-kraxel@redhat.com> References: <20210622124915.261060-1-kraxel@redhat.com> <20210622124915.261060-2-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action 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: Markus Armbruster , Richard Henderson , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 22 Jun 2021 14:49:11 +0200 Gerd Hoffmann wrote: > Allow commands having a NULL cmd pointer, add a function to set the > pointer later. Use case: allow modules implement hmp commands. >=20 > Signed-off-by: Gerd Hoffmann > --- > include/monitor/monitor.h | 3 +++ > monitor/hmp.c | 7 +++++++ > monitor/misc.c | 15 +++++++++++++++ > 3 files changed, 25 insertions(+) >=20 > diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h > index 1211d6e6d69f..1a8a369b50b2 100644 > --- a/include/monitor/monitor.h > +++ b/include/monitor/monitor.h > @@ -51,4 +51,7 @@ int monitor_fdset_dup_fd_add(int64_t fdset_id, int flag= s); > void monitor_fdset_dup_fd_remove(int dup_fd); > int64_t monitor_fdset_dup_fd_find(int dup_fd); > =20 > +void monitor_register_hmp(const char *name, bool info, > + void (*cmd)(Monitor *mon, const QDict *qdict))= ; > + > #endif /* MONITOR_H */ > diff --git a/monitor/hmp.c b/monitor/hmp.c > index 6c0b33a0b19d..d50c3124e1e1 100644 > --- a/monitor/hmp.c > +++ b/monitor/hmp.c > @@ -1089,6 +1089,13 @@ void handle_hmp_command(MonitorHMP *mon, const cha= r *cmdline) > return; > } > =20 > + if (!cmd->cmd) { > + /* FIXME: is it useful to try autoload modules here ??? */ > + monitor_printf(&mon->common, "Command \"%.*s\" is not available.= \n", > + (int)(cmdline - cmd_start), cmd_start); > + return; > + } > + > qdict =3D monitor_parse_arguments(&mon->common, &cmdline, cmd); > if (!qdict) { > while (cmdline > cmd_start && qemu_isspace(cmdline[-1])) { > diff --git a/monitor/misc.c b/monitor/misc.c > index 1539e18557f0..672267008b02 100644 > --- a/monitor/misc.c > +++ b/monitor/misc.c > @@ -1974,6 +1974,21 @@ static void sortcmdlist(void) > compare_mon_cmd); > } > =20 > +void monitor_register_hmp(const char *name, bool info, > + void (*cmd)(Monitor *mon, const QDict *qdict)) > +{ > + HMPCommand *table =3D info ? hmp_info_cmds : hmp_cmds; > + > + while (table->name !=3D NULL) { > + if (strcmp(table->name, name) =3D=3D 0) { Would it make sense to register the same command multiple times ? I guess it doesn't, so you may add an assert(table->cmd =3D=3D NULL) here. > + table->cmd =3D cmd; > + return; > + } > + table++; > + } > + g_assert_not_reached(); > +} > + > void monitor_init_globals(void) > { > monitor_init_globals_core();