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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 048D1C49EA6 for ; Thu, 24 Jun 2021 14:56:55 +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 972B361375 for ; Thu, 24 Jun 2021 14:56:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 972B361375 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]:38326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwQmj-0003zt-Ci for qemu-devel@archiver.kernel.org; Thu, 24 Jun 2021 10:56:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwQlr-00032w-Ag for qemu-devel@nongnu.org; Thu, 24 Jun 2021 10:55:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwQlo-00078Q-BG for qemu-devel@nongnu.org; Thu, 24 Jun 2021 10:55:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624546555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nSoA0OAMHBSbNfGdbr8CHT/BCNkjHZFPytF1MJBEP9U=; b=K65Eg8zOywKzZTmAkGMVmosAOFmDsUfC2ya9GkEJAGLSHXq2+JHNXBcM1tcgFB7vlw8TqT sQWUSfE4Wf3nj7NZuFPJTmu3dx/4Pks9EW2h9ew8krgOm0+xIDMy7YXVymTdGdpsIUkjTl gFD38lM2NnSmfoa3WdDSSL6TgdQS0EU= 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-207-SnLR2jgjNAuGJzs3x4FGqg-1; Thu, 24 Jun 2021 10:55:53 -0400 X-MC-Unique: SnLR2jgjNAuGJzs3x4FGqg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1FE2100CA88; Thu, 24 Jun 2021 14:55:51 +0000 (UTC) Received: from work-vm (ovpn-114-255.ams2.redhat.com [10.36.114.255]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9090E2C8; Thu, 24 Jun 2021 14:55:31 +0000 (UTC) Date: Thu, 24 Jun 2021 15:55:29 +0100 From: "Dr. David Alan Gilbert" To: Gerd Hoffmann Subject: Re: [PATCH v4 30/34] monitor: allow register hmp commands Message-ID: References: <20210624103836.2382472-1-kraxel@redhat.com> <20210624103836.2382472-31-kraxel@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210624103836.2382472-31-kraxel@redhat.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.362, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "Michael S. Tsirkin" , qemu-devel@nongnu.org, Samuel Thibault , qemu-block@nongnu.org, David Hildenbrand , Markus Armbruster , Halil Pasic , Christian Borntraeger , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , Peter Lieven , Greg Kurz , qemu-s390x@nongnu.org, Ronnie Sahlberg , Cleber Rosa , David Gibson , Kevin Wolf , Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= , Cornelia Huck , Max Reitz , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Gerd Hoffmann (kraxel@redhat.com) wrote: > Allow commands having a NULL cmd pointer, add a function to set the > pointer later. Use case: allow modules implement hmp commands. > > Signed-off-by: Gerd Hoffmann So this is OK, so Acked-by: Dr. David Alan Gilbert however, I can imagine: a) Auto load as you suggest b) Making the error better 'Command ... needs module ....' c) Don't actually define the command in the tables at all; make the module actually add the command to the table. Dave > --- > include/monitor/monitor.h | 3 +++ > monitor/hmp.c | 7 +++++++ > monitor/misc.c | 16 ++++++++++++++++ > 3 files changed, 26 insertions(+) > > 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 flags); > void monitor_fdset_dup_fd_remove(int dup_fd); > int64_t monitor_fdset_dup_fd_find(int dup_fd); > > +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 char *cmdline) > return; > } > > + 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 = 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..ad476c6e51ea 100644 > --- a/monitor/misc.c > +++ b/monitor/misc.c > @@ -1974,6 +1974,22 @@ static void sortcmdlist(void) > compare_mon_cmd); > } > > +void monitor_register_hmp(const char *name, bool info, > + void (*cmd)(Monitor *mon, const QDict *qdict)) > +{ > + HMPCommand *table = info ? hmp_info_cmds : hmp_cmds; > + > + while (table->name != NULL) { > + if (strcmp(table->name, name) == 0) { > + g_assert(table->cmd == NULL); > + table->cmd = cmd; > + return; > + } > + table++; > + } > + g_assert_not_reached(); > +} > + > void monitor_init_globals(void) > { > monitor_init_globals_core(); > -- > 2.31.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK