From patchwork Thu Jun 13 15:33:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 10992817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 601171515 for ; Thu, 13 Jun 2019 16:37:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 502101FF83 for ; Thu, 13 Jun 2019 16:37:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DFBE2023F; Thu, 13 Jun 2019 16:37:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6D5B22BF1 for ; Thu, 13 Jun 2019 16:37:24 +0000 (UTC) Received: from localhost ([::1]:41578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbSj6-0001O9-0i for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Jun 2019 12:37:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59824) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbRkk-0000Lz-Gz for qemu-devel@nongnu.org; Thu, 13 Jun 2019 11:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbRkg-0003Gm-Hr for qemu-devel@nongnu.org; Thu, 13 Jun 2019 11:35:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbRkU-00036Z-Rj; Thu, 13 Jun 2019 11:34:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E04C988E5B; Thu, 13 Jun 2019 15:34:40 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-116-246.ams2.redhat.com [10.36.116.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F15260FFE; Thu, 13 Jun 2019 15:34:36 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 17:33:55 +0200 Message-Id: <20190613153405.24769-6-kwolf@redhat.com> In-Reply-To: <20190613153405.24769-1-kwolf@redhat.com> References: <20190613153405.24769-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 13 Jun 2019 15:34:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 05/15] monitor: Remove Monitor.cmd_table indirection 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, berrange@redhat.com, qemu-block@nongnu.org, armbru@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Monitor.cmd_table is initialised to point to mon_cmds and never changed afterwards. We can remove the indirection and just reference mon_cmds directly instead. Signed-off-by: Kevin Wolf Reviewed-by: Markus Armbruster --- monitor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 572449f6db..5eacaa48a6 100644 --- a/monitor.c +++ b/monitor.c @@ -193,7 +193,6 @@ struct Monitor { bool use_io_thread; gchar *mon_cpu_path; - mon_cmd_t *cmd_table; QTAILQ_ENTRY(Monitor) entry; /* @@ -722,8 +721,6 @@ static void monitor_data_init(Monitor *mon, int flags, bool skip_flush, } qemu_mutex_init(&mon->mon_lock); mon->outbuf = qstring_new(); - /* Use *mon_cmds by default. */ - mon->cmd_table = mon_cmds; mon->skip_flush = skip_flush; mon->use_io_thread = use_io_thread; mon->flags = flags; @@ -1026,7 +1023,7 @@ static void help_cmd(Monitor *mon, const char *name) } /* 2. dump the contents according to parsed args */ - help_cmd_dump(mon, mon->cmd_table, args, nb_args, 0); + help_cmd_dump(mon, mon_cmds, args, nb_args, 0); free_cmdline_args(args, nb_args); } @@ -3487,7 +3484,7 @@ static void handle_hmp_command(MonitorHMP *mon, const char *cmdline) trace_handle_hmp_command(mon, cmdline); - cmd = monitor_parse_command(mon, cmdline, &cmdline, mon->common.cmd_table); + cmd = monitor_parse_command(mon, cmdline, &cmdline, mon_cmds); if (!cmd) { return; } @@ -4134,7 +4131,7 @@ static void monitor_find_completion(void *opaque, } /* 2. auto complete according to args */ - monitor_find_completion_by_table(mon, mon->common.cmd_table, args, nb_args); + monitor_find_completion_by_table(mon, mon_cmds, args, nb_args); cleanup: free_cmdline_args(args, nb_args);