From nobody Mon Feb 9 09:09:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502966791734322.6421064218888; Thu, 17 Aug 2017 03:46:31 -0700 (PDT) Received: from localhost ([::1]:44239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIJq-0006ZT-KV for importer@patchew.org; Thu, 17 Aug 2017 06:46:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diIFq-0003WD-Hi for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:42:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diIFp-0005DK-1b for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:42:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38534) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diIFo-0005D4-Rz for qemu-devel@nongnu.org; Thu, 17 Aug 2017 06:42:20 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF036FA8B8 for ; Thu, 17 Aug 2017 10:42:19 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-116-155.ams2.redhat.com [10.36.116.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26B9F7A306; Thu, 17 Aug 2017 10:42:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CF036FA8B8 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=dgilbert@redhat.com From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, armbru@redhat.com Date: Thu, 17 Aug 2017 11:42:16 +0100 Message-Id: <20170817104216.29150-3-dgilbert@redhat.com> In-Reply-To: <20170817104216.29150-1-dgilbert@redhat.com> References: <20170817104216.29150-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 17 Aug 2017 10:42:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] hmp: Fix unknown command for subtable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" (qemu) info foo unknown command: 'foo' fix this to: (qemu) info foo unknown command: 'info foo' Reported-by: Markus Armbruster Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake --- monitor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index e0f880107f..0695bd59d4 100644 --- a/monitor.c +++ b/monitor.c @@ -2693,6 +2693,7 @@ static const mon_cmd_t *search_dispatch_table(const m= on_cmd_t *disp_table, * the command is found in a sub-command table. */ static const mon_cmd_t *monitor_parse_command(Monitor *mon, + const char *cmdp_start, const char **cmdp, mon_cmd_t *table) { @@ -2708,7 +2709,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor= *mon, cmd =3D search_dispatch_table(table, cmdname); if (!cmd) { monitor_printf(mon, "unknown command: '%.*s'\n", - (int)(p - *cmdp), *cmdp); + (int)(p - cmdp_start), cmdp_start); return NULL; } =20 @@ -2720,7 +2721,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor= *mon, *cmdp =3D p; /* search sub command */ if (cmd->sub_table !=3D NULL && *p !=3D '\0') { - return monitor_parse_command(mon, cmdp, cmd->sub_table); + return monitor_parse_command(mon, cmdp_start, cmdp, cmd->sub_table= ); } =20 return cmd; @@ -3104,7 +3105,7 @@ static void handle_hmp_command(Monitor *mon, const ch= ar *cmdline) =20 trace_handle_hmp_command(mon, cmdline); =20 - cmd =3D monitor_parse_command(mon, &cmdline, mon->cmd_table); + cmd =3D monitor_parse_command(mon, cmdline, &cmdline, mon->cmd_table); if (!cmd) { return; } --=20 2.13.5