[{"id":3676077,"web_url":"http://patchwork.ozlabs.org/comment/3676077/","msgid":"","list_archive_url":null,"date":"2026-04-10T22:57:54","subject":"Re: [PATCH 03/17] monitor: rename monitor_init* to monitor_new*","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 current \"monitor_init\" functions will clash with the methods of the\n> same name that are required by QOM. To ease the transition to QOM,\n> rename them out of the way.\n> \n> Signed-off-by: Daniel P. Berrangé \n\nReviewed-by: Dr. David Alan Gilbert \n\n> ---\n> chardev/char.c | 2 +-\n> gdbstub/system.c | 2 +-\n> include/monitor/monitor.h | 8 ++++----\n> monitor/hmp.c | 2 +-\n> monitor/monitor.c | 10 +++++-----\n> monitor/qmp.c | 2 +-\n> storage-daemon/qemu-storage-daemon.c | 2 +-\n> stubs/monitor-internal.c | 2 +-\n> system/vl.c | 2 +-\n> 9 files changed, 16 insertions(+), 16 deletions(-)\n> \n> diff --git a/chardev/char.c b/chardev/char.c\n> index 48b326d57b..b59972f325 100644\n> --- a/chardev/char.c\n> +++ b/chardev/char.c\n> @@ -786,7 +786,7 @@ static Chardev *qemu_chr_new_from_name(const char *label, const char *filename,\n> \n> if (qemu_opt_get_bool(opts, \"mux\", 0)) {\n> assert(permit_mux_mon);\n> - monitor_init_hmp(chr, true, &err);\n> + monitor_new_hmp(chr, true, &err);\n> if (err) {\n> error_report_err(err);\n> object_unparent(OBJECT(chr));\n> diff --git a/gdbstub/system.c b/gdbstub/system.c\n> index e86c5870ab..20dcf7878d 100644\n> --- a/gdbstub/system.c\n> +++ b/gdbstub/system.c\n> @@ -388,7 +388,7 @@ bool gdbserver_start(const char *device, Error **errp)\n> /* Initialize a monitor terminal for gdb */\n> mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB,\n> NULL, NULL, &error_abort);\n> - monitor_init_hmp(mon_chr, false, &error_abort);\n> + monitor_new_hmp(mon_chr, false, &error_abort);\n> } else {\n> qemu_chr_fe_deinit(&gdbserver_system_state.chr, true);\n> mon_chr = gdbserver_system_state.mon_chr;\n> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h\n> index 296690e1f1..bfbb440550 100644\n> --- a/include/monitor/monitor.h\n> +++ b/include/monitor/monitor.h\n> @@ -19,10 +19,10 @@ bool monitor_cur_is_qmp(void);\n> \n> void monitor_init_globals(void);\n> void monitor_init_globals_core(void);\n> -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp);\n> -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp);\n> -int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp);\n> -int monitor_init_opts(QemuOpts *opts, Error **errp);\n> +void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp);\n> +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp);\n> +int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp);\n> +int monitor_new_opts(QemuOpts *opts, Error **errp);\n> void monitor_cleanup(void);\n> \n> int monitor_suspend(Monitor *mon);\n> diff --git a/monitor/hmp.c b/monitor/hmp.c\n> index af346d190b..6dfeca84b5 100644\n> --- a/monitor/hmp.c\n> +++ b/monitor/hmp.c\n> @@ -1516,7 +1516,7 @@ static void monitor_readline_flush(void *opaque)\n> monitor_flush(&mon->parent);\n> }\n> \n> -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp)\n> +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n> {\n> MonitorHMP *mon = g_new0(MonitorHMP, 1);\n> \n> diff --git a/monitor/monitor.c b/monitor/monitor.c\n> index 6b183edcf5..393fb7795e 100644\n> --- a/monitor/monitor.c\n> +++ b/monitor/monitor.c\n> @@ -715,7 +715,7 @@ void monitor_init_globals(void)\n> aio_co_schedule(iohandler_get_aio_context(), qmp_dispatcher_co);\n> }\n> \n> -int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)\n> +int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp)\n> {\n> ERRP_GUARD();\n> Chardev *chr;\n> @@ -732,7 +732,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)\n> \n> switch (opts->mode) {\n> case MONITOR_MODE_CONTROL:\n> - monitor_init_qmp(chr, opts->pretty, errp);\n> + monitor_new_qmp(chr, opts->pretty, errp);\n> break;\n> case MONITOR_MODE_READLINE:\n> if (!allow_hmp) {\n> @@ -743,7 +743,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)\n> error_setg(errp, \"'pretty' is not compatible with HMP monitors\");\n> return -1;\n> }\n> - monitor_init_hmp(chr, true, errp);\n> + monitor_new_hmp(chr, true, errp);\n> break;\n> default:\n> g_assert_not_reached();\n> @@ -752,7 +752,7 @@ int monitor_init(MonitorOptions *opts, bool allow_hmp, Error **errp)\n> return *errp ? -1 : 0;\n> }\n> \n> -int monitor_init_opts(QemuOpts *opts, Error **errp)\n> +int monitor_new_opts(QemuOpts *opts, Error **errp)\n> {\n> Visitor *v;\n> MonitorOptions *options;\n> @@ -765,7 +765,7 @@ int monitor_init_opts(QemuOpts *opts, Error **errp)\n> return -1;\n> }\n> \n> - ret = monitor_init(options, true, errp);\n> + ret = monitor_new(options, true, errp);\n> qapi_free_MonitorOptions(options);\n> return ret;\n> }\n> diff --git a/monitor/qmp.c b/monitor/qmp.c\n> index 69d9e40e32..9caee70624 100644\n> --- a/monitor/qmp.c\n> +++ b/monitor/qmp.c\n> @@ -513,7 +513,7 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)\n> monitor_list_append(&mon->parent);\n> }\n> \n> -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)\n> +void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)\n> {\n> MonitorQMP *mon = g_new0(MonitorQMP, 1);\n> \n> diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c\n> index eb72561358..50dbfbd97a 100644\n> --- a/storage-daemon/qemu-storage-daemon.c\n> +++ b/storage-daemon/qemu-storage-daemon.c\n> @@ -330,7 +330,7 @@ static void process_options(int argc, char *argv[], bool pre_init_pass)\n> visit_free(v);\n> \n> /* TODO Catch duplicate monitor IDs */\n> - monitor_init(monitor, false, &error_fatal);\n> + monitor_new(monitor, false, &error_fatal);\n> qapi_free_MonitorOptions(monitor);\n> break;\n> }\n> diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c\n> index 4fece49d53..23d58da184 100644\n> --- a/stubs/monitor-internal.c\n> +++ b/stubs/monitor-internal.c\n> @@ -8,6 +8,6 @@ int monitor_get_fd(Monitor *mon, const char *name, Error **errp)\n> return -1;\n> }\n> \n> -void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp)\n> +void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n> {\n> }\n> diff --git a/system/vl.c b/system/vl.c\n> index 246623b319..2391811a46 100644\n> --- a/system/vl.c\n> +++ b/system/vl.c\n> @@ -1244,7 +1244,7 @@ static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp)\n> \n> static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)\n> {\n> - return monitor_init_opts(opts, errp);\n> + return monitor_new_opts(opts, errp);\n> }\n> \n> static void monitor_parse(const char *str, const char *mode, bool pretty)\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=OM9Nu7QE;\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 4fssgC6tSXz1yCv\n\tfor ; Sat, 11 Apr 2026 08:59:01 +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 1wBKna-000643-ET; Fri, 10 Apr 2026 18:58:02 -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 1wBKnZ-00063j-CC; Fri, 10 Apr 2026 18:58:01 -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 1wBKnX-0001CR-74; Fri, 10 Apr 2026 18:58:01 -0400","from dg by mx.treblig.org with local (Exim 4.98.2)\n (envelope-from ) id 1wBKnS-00000007ZYZ-1nhP;\n Fri, 10 Apr 2026 22:57:54 +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=THuLOX2PCskfL3cYNUmso7wv62RwWCISNYR590+ueIY=; b=OM9Nu7QES5lWU4kR\n 5pCRBcNmRgRuG/snYQZDONr8zhLHni+GqmYsHtjHL/KDUKpSAmB6EAw15hny5DQWGgj2yxjzqgnr0\n qBL3OIVU1CqAVB2uDeGtKNRmvl4l5HKkxoYt9ouu0n5XswUKCn58kJQR5r53kFpQRU17DkOFLs981\n dIBIM7ht9/4bCzPSRgQJNlZv3t6I9+RPrLMoE3UxmpyuhUpExday6rA982kdYOu1HGbQUgA2pHdto\n SomJYaqc8JvkNLCehUnKMihVyzp0igehiNyTJ+LUAQK4ogKnZpWqpO57tzXVe7RmZ3YQWeRkRnymg\n QdWTEKHdQqUuTSSHkg==;","Date":"Fri, 10 Apr 2026 22:57:54 +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 03/17] monitor: rename monitor_init* to monitor_new*","Message-ID":"","References":"<20260410160458.3778874-1-berrange@redhat.com>\n <20260410160458.3778874-4-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-4-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":"22:57:47 up 29 days, 11 min, 2 users, load average: 0.04, 0.02,\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"}}]