From nobody Tue Sep 30 21:11:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.47 as permitted sender) client-ip=209.51.188.47; 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 209.51.188.47 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559915993; cv=none; d=zoho.com; s=zohoarc; b=RRNWKIWtFD54BJ5gWa79xY3Bys2Fk/VpQc8LuivZyBIMxvsDppXKSGd1X8XzWl19QzGb0u7IrpKGFYdVfulnEB436imflymB6ai2oSGGbFe30PvbGRQO27/EEdJI+DxxZ91cwCN3aJ3YiJTfYgKdpaT2IwWvMALtMRgs5+Xx1FY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559915993; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gyUfsOS3qZQKuJKF4cFKsg+0lNJQSet/KKcKRSFR/nA=; b=hOfXaN9qkANv4Wo2Lxigfoz/l2akuSQ9YAJ1+MQrPMjXwaSSqt87C0OsPpWXNkdUYji0DpIW85041xWTL+zJ1F4DLm1f/8irH/t7cMHkEHzO+iiBQXhURKrjS1f/bxCybgXHmzM491gNWpMdjttl+7F02dRtsx7X3AI9rNAlyYM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.47 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.47 [209.51.188.47]) by mx.zohomail.com with SMTPS id 1559915993321328.7525398169995; Fri, 7 Jun 2019 06:59:53 -0700 (PDT) Received: from localhost ([::1]:51438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFPE-0006ol-1v for importer@patchew.org; Fri, 07 Jun 2019 09:59:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45104) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZFKf-0001ae-QW for qemu-devel@nongnu.org; Fri, 07 Jun 2019 09:55:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZFKd-0003Ca-SQ for qemu-devel@nongnu.org; Fri, 07 Jun 2019 09:55:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZFKZ-0002jl-Vs; Fri, 07 Jun 2019 09:54:56 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 1CCA630BC578; Fri, 7 Jun 2019 13:54:46 +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 ESMTP id DD2531001B0C; Fri, 7 Jun 2019 13:54:43 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 7 Jun 2019 15:54:25 +0200 Message-Id: <20190607135430.22149-6-kwolf@redhat.com> In-Reply-To: <20190607135430.22149-1-kwolf@redhat.com> References: <20190607135430.22149-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 07 Jun 2019 13:54:46 +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: [Qemu-devel] [RFC PATCH 05/10] monitor: Move cmd_table to MonitorHMP 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, armbru@redhat.com, qemu-block@nongnu.org, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Monitor.cmd_table contains the handlers for HMP commands, so there is no reason to keep it in the state shared with QMP. Move it to MonitorHMP. Signed-off-by: Kevin Wolf Reviewed-by: Dr. David Alan Gilbert --- monitor.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index 810f3dcf9c..d964dd1969 100644 --- a/monitor.c +++ b/monitor.c @@ -191,7 +191,6 @@ struct Monitor { bool use_io_thread; =20 gchar *mon_cpu_path; - mon_cmd_t *cmd_table; QTAILQ_ENTRY(Monitor) entry; =20 /* @@ -219,6 +218,7 @@ struct MonitorHMP { * These members can be safely accessed without locks. */ ReadLineState *rs; + mon_cmd_t *cmd_table; }; =20 typedef struct { @@ -720,13 +720,19 @@ static void monitor_data_init(Monitor *mon, int flags= , bool skip_flush, memset(mon, 0, sizeof(Monitor)); qemu_mutex_init(&mon->mon_lock); mon->outbuf =3D qstring_new(); - /* Use *mon_cmds by default. */ - mon->cmd_table =3D mon_cmds; mon->skip_flush =3D skip_flush; mon->use_io_thread =3D use_io_thread; mon->flags =3D flags; } =20 +static void monitor_data_init_hmp(MonitorHMP *mon, int flags, bool skip_fl= ush) +{ + monitor_data_init(&mon->common, flags, skip_flush, false); + + /* Use *mon_cmds by default. */ + mon->cmd_table =3D mon_cmds; +} + static void monitor_data_destroy_qmp(MonitorQMP *mon) { json_message_parser_destroy(&mon->parser); @@ -757,7 +763,7 @@ char *qmp_human_monitor_command(const char *command_lin= e, bool has_cpu_index, Monitor *old_mon; MonitorHMP hmp =3D {}; =20 - monitor_data_init(&hmp.common, 0, true, false); + monitor_data_init_hmp(&hmp, 0, true); =20 old_mon =3D cur_mon; cur_mon =3D &hmp.common; @@ -1002,6 +1008,7 @@ static void help_cmd_dump(Monitor *mon, const mon_cmd= _t *cmds, =20 static void help_cmd(Monitor *mon, const char *name) { + MonitorHMP *hmp_mon =3D container_of(mon, MonitorHMP, common); char *args[MAX_ARGS]; int nb_args =3D 0; =20 @@ -1024,7 +1031,7 @@ static void help_cmd(Monitor *mon, const char *name) } =20 /* 2. dump the contents according to parsed args */ - help_cmd_dump(mon, mon->cmd_table, args, nb_args, 0); + help_cmd_dump(mon, hmp_mon->cmd_table, args, nb_args, 0); =20 free_cmdline_args(args, nb_args); } @@ -3477,7 +3484,7 @@ static void handle_hmp_command(MonitorHMP *mon, const= char *cmdline) =20 trace_handle_hmp_command(mon, cmdline); =20 - cmd =3D monitor_parse_command(mon, cmdline, &cmdline, mon->common.cmd_= table); + cmd =3D monitor_parse_command(mon, cmdline, &cmdline, mon->cmd_table); if (!cmd) { return; } @@ -4124,7 +4131,7 @@ static void monitor_find_completion(void *opaque, } =20 /* 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->cmd_table, args, nb_args); =20 cleanup: free_cmdline_args(args, nb_args); @@ -4680,7 +4687,7 @@ static void monitor_init_hmp(Chardev *chr, int flags) MonitorHMP *mon =3D g_malloc0(sizeof(*mon)); bool use_readline =3D flags & MONITOR_USE_READLINE; =20 - monitor_data_init(&mon->common, flags, false, false); + monitor_data_init_hmp(mon, flags, false); qemu_chr_fe_init(&mon->common.chr, chr, &error_abort); =20 if (use_readline) { --=20 2.20.1