{"id":2222022,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222022/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-4-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260410160458.3778874-4-berrange@redhat.com>","date":"2026-04-10T16:04:44","name":"[03/17] monitor: rename monitor_init* to monitor_new*","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a57d86cb68c123b3f270476aaccd6c4b9fdba9e0","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/1.1/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-4-berrange@redhat.com/mbox/","series":[{"id":499483,"url":"http://patchwork.ozlabs.org/api/1.1/series/499483/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499483","date":"2026-04-10T16:04:41","name":"monitor: turn QMP and HMP into QOM objects","version":1,"mbox":"http://patchwork.ozlabs.org/series/499483/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222022/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222022/checks/","tags":{},"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 (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=hOTOt95l;\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 4fshWR3R0Gz1yGb\n\tfor ; Sat, 11 Apr 2026 02:06:43 +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 1wBEMk-0004Aw-EX; Fri, 10 Apr 2026 12:05:54 -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 1wBEMG-0003yd-I1\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:26 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\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 1wBEME-0006OV-LY\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:24 -0400","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-roai83NQMB-eLm_nU87jrw-1; Fri,\n 10 Apr 2026 12:05:16 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 3565418002CA; Fri, 10 Apr 2026 16:05:15 +0000 (UTC)","from toolbx.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com\n [10.2.32.101])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id E45DA195608E; Fri, 10 Apr 2026 16:05:11 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837122;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=aYljcxjAWI5mIsfVriofuWNiJ+RWRgV4TbNm/RQMm9g=;\n b=hOTOt95lF6KubWEzl0PJ9i+Fmb3RVYyJtyLbSebR4IHmYSB9g5hKN8Zq2qvF0UAhRROCD+\n a5+aL9rSREce37Ak74D1q95N+QehPui/zluDAH91xn0b2UKzHphN7pn5PlACRA+VUXmyOM\n 9MBXuBfaWjpbJeXqDSVz0Ku1mJHp4Ew=","X-MC-Unique":"roai83NQMB-eLm_nU87jrw-1","X-Mimecast-MFC-AGG-ID":"roai83NQMB-eLm_nU87jrw_1775837115","From":"=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Paolo Bonzini ,\n Markus Armbruster ,\n Christian Brauner ,\n =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?=\n\t=?utf-8?q?athieu-Daud=C3=A9?= ,\n Fabiano Rosas ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n Peter Xu , Kevin Wolf , =?utf-8?q?Dani?=\n\t=?utf-8?q?el_P=2E_Berrang=C3=A9?= ,\n qemu-block@nongnu.org, \"Dr. David Alan Gilbert\" ,\n Eric Blake ","Subject":"[PATCH 03/17] monitor: rename monitor_init* to monitor_new*","Date":"Fri, 10 Apr 2026 17:04:44 +0100","Message-ID":"<20260410160458.3778874-4-berrange@redhat.com>","In-Reply-To":"<20260410160458.3778874-1-berrange@redhat.com>","References":"<20260410160458.3778874-1-berrange@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=berrange@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-25","X-Spam_score":"-2.6","X-Spam_bar":"--","X-Spam_report":"(-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, 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"},"content":"The current \"monitor_init\" functions will clash with the methods of the\nsame name that are required by QOM. To ease the transition to QOM,\nrename them out of the way.\n\nSigned-off-by: Daniel P. Berrangé \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(-)","diff":"diff --git a/chardev/char.c b/chardev/char.c\nindex 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));\ndiff --git a/gdbstub/system.c b/gdbstub/system.c\nindex 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;\ndiff --git a/include/monitor/monitor.h b/include/monitor/monitor.h\nindex 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);\ndiff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 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 \ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 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 }\ndiff --git a/monitor/qmp.c b/monitor/qmp.c\nindex 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 \ndiff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c\nindex 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 }\ndiff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c\nindex 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 }\ndiff --git a/system/vl.c b/system/vl.c\nindex 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","prefixes":["03/17"]}