[{"id":3676054,"web_url":"http://patchwork.ozlabs.org/comment/3676054/","msgid":"","list_archive_url":null,"date":"2026-04-10T21:05:28","subject":"Re: [PATCH 01/17] monitor: replace 'common' with 'parent' in\n MonitorHMP","submitter":{"id":86099,"url":"http://patchwork.ozlabs.org/api/people/86099/","name":"Dr. David Alan Gilbert","email":"dave@treblig.org"},"content":"* Daniel P. Berrangé (berrange@redhat.com) wrote:\n> The field name 'parent' is standard practice for QOM structs\n> so align the HMP monitor.\n> \n> Signed-off-by: Daniel P. Berrangé \n\nJust a rename, fine;\n\nReviewed-by: Dr. David Alan Gilbert \n\n> ---\n> monitor/hmp-cmds.c | 2 +-\n> monitor/hmp.c | 40 +++++++++++++++++++-------------------\n> monitor/monitor-internal.h | 2 +-\n> monitor/monitor.c | 6 +++---\n> monitor/qmp-cmds.c | 10 +++++-----\n> ui/ui-hmp-cmds.c | 2 +-\n> 6 files changed, 31 insertions(+), 31 deletions(-)\n> \n> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c\n> index bc26b39d70..911d984cbe 100644\n> --- a/monitor/hmp-cmds.c\n> +++ b/monitor/hmp-cmds.c\n> @@ -236,7 +236,7 @@ void hmp_info_sync_profile(Monitor *mon, const QDict *qdict)\n> \n> void hmp_info_history(Monitor *mon, const QDict *qdict)\n> {\n> - MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);\n> + MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, parent);\n> int i;\n> const char *str;\n> \n> diff --git a/monitor/hmp.c b/monitor/hmp.c\n> index 0e5913fabb..af346d190b 100644\n> --- a/monitor/hmp.c\n> +++ b/monitor/hmp.c\n> @@ -47,9 +47,9 @@ static void monitor_command_cb(void *opaque, const char *cmdline,\n> {\n> MonitorHMP *mon = opaque;\n> \n> - monitor_suspend(&mon->common);\n> + monitor_suspend(&mon->parent);\n> handle_hmp_command(mon, cmdline);\n> - monitor_resume(&mon->common);\n> + monitor_resume(&mon->parent);\n> }\n> \n> void monitor_read_command(MonitorHMP *mon, int show_prompt)\n> @@ -72,7 +72,7 @@ int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func,\n> /* prompt is printed on return from the command handler */\n> return 0;\n> } else {\n> - monitor_printf(&mon->common,\n> + monitor_printf(&mon->parent,\n> \"terminal does not support password prompting\\n\");\n> return -ENOTTY;\n> }\n> @@ -689,7 +689,7 @@ static const HMPCommand *monitor_parse_command(MonitorHMP *hmp_mon,\n> const char **cmdp,\n> HMPCommand *table)\n> {\n> - Monitor *mon = &hmp_mon->common;\n> + Monitor *mon = &hmp_mon->parent;\n> const char *p;\n> const HMPCommand *cmd;\n> char cmdname[256];\n> @@ -1182,35 +1182,35 @@ void handle_hmp_command(MonitorHMP *mon, const char *cmdline)\n> \n> if (!cmd->cmd && !cmd->cmd_info_hrt) {\n> /* FIXME: is it useful to try autoload modules here ??? */\n> - monitor_printf(&mon->common, \"Command \\\"%.*s\\\" is not available.\\n\",\n> + monitor_printf(&mon->parent, \"Command \\\"%.*s\\\" is not available.\\n\",\n> (int)(cmdline - cmd_start), cmd_start);\n> return;\n> }\n> \n> - qdict = monitor_parse_arguments(&mon->common, &cmdline, cmd);\n> + qdict = monitor_parse_arguments(&mon->parent, &cmdline, cmd);\n> if (!qdict) {\n> while (cmdline > cmd_start && qemu_isspace(cmdline[-1])) {\n> cmdline--;\n> }\n> - monitor_printf(&mon->common, \"Try \\\"help %.*s\\\" for more information\\n\",\n> + monitor_printf(&mon->parent, \"Try \\\"help %.*s\\\" for more information\\n\",\n> (int)(cmdline - cmd_start), cmd_start);\n> return;\n> }\n> \n> if (!cmd->coroutine) {\n> /* old_mon is non-NULL when called from qmp_human_monitor_command() */\n> - Monitor *old_mon = monitor_set_cur(qemu_coroutine_self(), &mon->common);\n> - handle_hmp_command_exec(&mon->common, cmd, qdict);\n> + Monitor *old_mon = monitor_set_cur(qemu_coroutine_self(), &mon->parent);\n> + handle_hmp_command_exec(&mon->parent, cmd, qdict);\n> monitor_set_cur(qemu_coroutine_self(), old_mon);\n> } else {\n> HandleHmpCommandCo data = {\n> - .mon = &mon->common,\n> + .mon = &mon->parent,\n> .cmd = cmd,\n> .qdict = qdict,\n> .done = false,\n> };\n> Coroutine *co = qemu_coroutine_create(handle_hmp_command_co, &data);\n> - monitor_set_cur(co, &mon->common);\n> + monitor_set_cur(co, &mon->parent);\n> aio_co_enter(qemu_get_aio_context(), co);\n> AIO_WAIT_WHILE_UNLOCKED(NULL, !data.done);\n> }\n> @@ -1428,7 +1428,7 @@ cleanup:\n> \n> static void monitor_read(void *opaque, const uint8_t *buf, int size)\n> {\n> - MonitorHMP *mon = container_of(opaque, MonitorHMP, common);\n> + MonitorHMP *mon = container_of(opaque, MonitorHMP, parent);\n> int i;\n> \n> if (mon->rs) {\n> @@ -1437,7 +1437,7 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size)\n> }\n> } else {\n> if (size == 0 || buf[size - 1] != 0) {\n> - monitor_printf(&mon->common, \"corrupted command\\n\");\n> + monitor_printf(&mon->parent, \"corrupted command\\n\");\n> } else {\n> handle_hmp_command(mon, (char *)buf);\n> }\n> @@ -1506,26 +1506,26 @@ static void G_GNUC_PRINTF(2, 3) monitor_readline_printf(void *opaque,\n> MonitorHMP *mon = opaque;\n> va_list ap;\n> va_start(ap, fmt);\n> - monitor_vprintf(&mon->common, fmt, ap);\n> + monitor_vprintf(&mon->parent, fmt, ap);\n> va_end(ap);\n> }\n> \n> static void monitor_readline_flush(void *opaque)\n> {\n> MonitorHMP *mon = opaque;\n> - monitor_flush(&mon->common);\n> + monitor_flush(&mon->parent);\n> }\n> \n> void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp)\n> {\n> MonitorHMP *mon = g_new0(MonitorHMP, 1);\n> \n> - if (!qemu_chr_fe_init(&mon->common.chr, chr, errp)) {\n> + if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n> g_free(mon);\n> return;\n> }\n> \n> - monitor_data_init(&mon->common, false, false, false);\n> + monitor_data_init(&mon->parent, false, false, false);\n> \n> mon->use_readline = use_readline;\n> if (mon->use_readline) {\n> @@ -1536,9 +1536,9 @@ void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp)\n> monitor_read_command(mon, 0);\n> }\n> \n> - qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, monitor_read,\n> - monitor_event, NULL, &mon->common, NULL, true);\n> - monitor_list_append(&mon->common);\n> + qemu_chr_fe_set_handlers(&mon->parent.chr, monitor_can_read, monitor_read,\n> + monitor_event, NULL, &mon->parent, NULL, true);\n> + monitor_list_append(&mon->parent);\n> }\n> \n> /**\n> diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\n> index feca111ae3..ae0cf8c1da 100644\n> --- a/monitor/monitor-internal.h\n> +++ b/monitor/monitor-internal.h\n> @@ -119,7 +119,7 @@ struct Monitor {\n> };\n> \n> struct MonitorHMP {\n> - Monitor common;\n> + Monitor parent;\n> bool use_readline;\n> /*\n> * State used only in the thread \"owning\" the monitor.\n> diff --git a/monitor/monitor.c b/monitor/monitor.c\n> index 00b93ed612..6532796edb 100644\n> --- a/monitor/monitor.c\n> +++ b/monitor/monitor.c\n> @@ -132,7 +132,7 @@ static inline bool monitor_is_hmp_non_interactive(const Monitor *mon)\n> return false;\n> }\n> \n> - return !monitor_uses_readline(container_of(mon, MonitorHMP, common));\n> + return !monitor_uses_readline(container_of(mon, MonitorHMP, parent));\n> }\n> \n> static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond,\n> @@ -542,7 +542,7 @@ static void monitor_accept_input(void *opaque)\n> \n> qemu_mutex_lock(&mon->mon_lock);\n> if (!monitor_is_qmp(mon) && mon->reset_seen) {\n> - MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);\n> + MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, parent);\n> assert(hmp_mon->rs);\n> readline_restart(hmp_mon->rs);\n> qemu_mutex_unlock(&mon->mon_lock);\n> @@ -627,7 +627,7 @@ void monitor_data_destroy(Monitor *mon)\n> if (monitor_is_qmp(mon)) {\n> monitor_data_destroy_qmp(container_of(mon, MonitorQMP, common));\n> } else {\n> - readline_free(container_of(mon, MonitorHMP, common)->rs);\n> + readline_free(container_of(mon, MonitorHMP, parent)->rs);\n> }\n> g_string_free(mon->outbuf, true);\n> qemu_mutex_destroy(&mon->mon_lock);\n> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c\n> index 0c409c27dc..191eba1b3a 100644\n> --- a/monitor/qmp-cmds.c\n> +++ b/monitor/qmp-cmds.c\n> @@ -168,10 +168,10 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n> char *output = NULL;\n> MonitorHMP hmp = {};\n> \n> - monitor_data_init(&hmp.common, false, true, false);\n> + monitor_data_init(&hmp.parent, false, true, false);\n> \n> if (has_cpu_index) {\n> - int ret = monitor_set_cpu(&hmp.common, cpu_index);\n> + int ret = monitor_set_cpu(&hmp.parent, cpu_index);\n> if (ret < 0) {\n> error_setg(errp, QERR_INVALID_PARAMETER_VALUE, \"cpu-index\",\n> \"a CPU number\");\n> @@ -181,12 +181,12 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n> \n> handle_hmp_command(&hmp, command_line);\n> \n> - WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {\n> - output = g_strdup(hmp.common.outbuf->str);\n> + WITH_QEMU_LOCK_GUARD(&hmp.parent.mon_lock) {\n> + output = g_strdup(hmp.parent.outbuf->str);\n> }\n> \n> out:\n> - monitor_data_destroy(&hmp.common);\n> + monitor_data_destroy(&hmp.parent);\n> return output;\n> }\n> \n> diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c\n> index 6c93d452c9..fe89632474 100644\n> --- a/ui/ui-hmp-cmds.c\n> +++ b/ui/ui-hmp-cmds.c\n> @@ -341,7 +341,7 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target,\n> return;\n> }\n> if (!arg) {\n> - MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);\n> + MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, parent);\n> monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);\n> } else {\n> qmp_change_vnc_password(arg, errp);\n> -- \n> 2.53.0\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=treblig.org header.i=@treblig.org header.a=rsa-sha256\n header.s=bytemarkmx header.b=ezz/GGlo;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fsq9C6LJbz1yCv\n\tfor ; Sat, 11 Apr 2026 07:06:22 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBJ2l-0007x2-88; Fri, 10 Apr 2026 17:05:35 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBJ2j-0007w7-R8; Fri, 10 Apr 2026 17:05:33 -0400","from mx.treblig.org ([2a00:1098:5b::1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBJ2h-00034T-7l; Fri, 10 Apr 2026 17:05:33 -0400","from dg by mx.treblig.org with local (Exim 4.98.2)\n (envelope-from ) id 1wBJ2e-00000007YRF-27cF;\n Fri, 10 Apr 2026 21:05:28 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org\n ; s=bytemarkmx;\n h=Content-Type:MIME-Version:Message-ID:Subject:From:Date:From\n :Subject; bh=t1Gf3E0eM1kvaubS45tIjqLZ3+nomW/VrDrQ8pcjq6Y=; b=ezz/GGlojV8cFijg\n sk/JDXC5URd2YbURQY5EQ8igS3uWCCxXY6ldAZmtLUsJCPjVAmLmL/4mYcLkpy+9v/3FNruX7QqqQ\n c7vs2vbFVWjHQNUR83LgLR5FKTJthG+Aoky1KH94+HFjllyqGgh8fLfLe7nY/UyQQP+mcz5FJjIrk\n G/XmFhi4F3lKbtg2804zr/J1Mus+ky66mKTJdvW2ZBRUhmSqYMm3/GsxRT76N1FVROJHrSYN05MpF\n lyluhFiJ8Vi9BBW70aoaywHlFkSx3SLoi94LLp/vuNz7tqL66bREKmZ6dGfudkjoHOkHW8Nev+B8b\n jcRWAW+Ge0rxgr6/TQ==;","Date":"Fri, 10 Apr 2026 21:05:28 +0000","From":"\"Dr. David Alan Gilbert\" ","To":"Daniel =?iso-8859-1?q?P=2E_Berrang=E9?= ","Cc":"qemu-devel@nongnu.org, Paolo Bonzini ,\n Markus Armbruster ,\n Christian Brauner ,\n Alex =?iso-8859-1?q?Benn=E9e?= , Philippe\n\t=?iso-8859-1?q?Mathieu-Daud=E9?= ,\n Fabiano Rosas ,\n =?iso-8859-1?q?Marc-Andr=E9?= Lureau ,\n Peter Xu , Kevin Wolf ,\n qemu-block@nongnu.org, Eric Blake ","Subject":"Re: [PATCH 01/17] monitor: replace 'common' with 'parent' in\n MonitorHMP","Message-ID":"","References":"<20260410160458.3778874-1-berrange@redhat.com>\n <20260410160458.3778874-2-berrange@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20260410160458.3778874-2-berrange@redhat.com>","X-Chocolate":"70 percent or better cocoa solids preferably","X-Operating-System":"Linux/6.12.74+deb13+1-amd64 (x86_64)","X-Uptime":"21:05:05 up 28 days, 22:18, 2 users, load average: 0.00, 0.00,\n 0.00","User-Agent":"Mutt/2.2.13 (2024-03-09)","Received-SPF":"pass client-ip=2a00:1098:5b::1; envelope-from=dg@treblig.org;\n helo=mx.treblig.org","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001,\n 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.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"}}]