{"id":2222028,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222028/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-7-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-7-berrange@redhat.com>","date":"2026-04-10T16:04:47","name":"[06/17] monitor: move monitor_data_(init|destroy) into QOM init/finalize","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a78f21e6aa9dcc8814862940fd73d70e9c75a878","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-7-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/2222028/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222028/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=UlKEwHZD;\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 4fshX63w0dz1yGb\n\tfor ; Sat, 11 Apr 2026 02:07:18 +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 1wBEMm-0004BV-5I; Fri, 10 Apr 2026 12:05:56 -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 1wBEMS-00041c-PG\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:41 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.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 1wBEMN-0006QO-LJ\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:33 -0400","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-0yd4hVrfMiqwAiWxTSJ2Tg-1; Fri,\n 10 Apr 2026 12:05:29 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 1DB6A1955DB2; Fri, 10 Apr 2026 16:05:27 +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 148B419560AB; Fri, 10 Apr 2026 16:05:22 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837131;\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=dyt0/iTo98cCfrgHgNq0Cv+2MCAtHHkp9DewmuMIsRU=;\n b=UlKEwHZDzAOSuTZl4ClTKzqLETBaWieoYyZWhJXu/c4tANpLpfZCCMWY0Kj+y3ricshWyf\n w1pqzEoguFNQpouE9CKSuFi209UikLNAaEbVGZN+zvamxHaUu5Vo9aPY6+RZI+/4t2A4W4\n Ame9qplnnl7p7p84lhu7DDJREkA3q0U=","X-MC-Unique":"0yd4hVrfMiqwAiWxTSJ2Tg-1","X-Mimecast-MFC-AGG-ID":"0yd4hVrfMiqwAiWxTSJ2Tg_1775837127","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 06/17] monitor: move monitor_data_(init|destroy) into QOM\n init/finalize","Date":"Fri, 10 Apr 2026 17:04:47 +0100","Message-ID":"<20260410160458.3778874-7-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.133.124;\n envelope-from=berrange@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"7","X-Spam_score":"0.7","X-Spam_bar":"/","X-Spam_report":"(0.7 / 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_H2=0.001, RCVD_IN_SBL_CSS=3.335,\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=no 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":"Start to take advantage of QOM, by using object init and finalize\nmethods to replace monitor_data_init and monitor_data_destroy.\n\nA standalone helper is provided to enable the I/O thread for QMP\nwhere appropriate for the chardev backend.\n\nSigned-off-by: Daniel P. Berrangé \n---\n monitor/hmp.c | 4 ++--\n monitor/monitor-internal.h | 3 +--\n monitor/monitor.c | 48 ++++++++++++++------------------------\n monitor/qmp-cmds.c | 3 ---\n monitor/qmp.c | 21 +++++++++--------\n 5 files changed, 32 insertions(+), 47 deletions(-)","diff":"diff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 72f8303662..833de0eee8 100644\n--- a/monitor/hmp.c\n+++ b/monitor/hmp.c\n@@ -46,6 +46,8 @@ OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP, MONITOR);\n \n static void monitor_hmp_finalize(Object *obj)\n {\n+ MonitorHMP *mon = MONITOR_HMP(obj);\n+ readline_free(mon->rs);\n }\n \n static void monitor_hmp_class_init(ObjectClass *cls, const void *data)\n@@ -1539,8 +1541,6 @@ void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n return;\n }\n \n- monitor_data_init(&mon->parent, false, false);\n-\n mon->use_readline = use_readline;\n if (mon->use_readline) {\n mon->rs = readline_init(monitor_readline_printf,\ndiff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex 84117805b7..5bfe3b7325 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -182,8 +182,7 @@ extern QmpCommandList qmp_commands, qmp_cap_negotiation_commands;\n extern QemuMutex monitor_lock;\n extern MonitorList mon_list;\n \n-void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread);\n-void monitor_data_destroy(Monitor *mon);\n+void monitor_iothread_init(Monitor *mon);\n int monitor_can_read(void *opaque);\n void monitor_list_append(Monitor *mon);\n void monitor_fdsets_cleanup(void);\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex f7e3708d2f..f6c90145f6 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -77,6 +77,12 @@ OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT);\n \n static void monitor_finalize(Object *obj)\n {\n+ Monitor *mon = MONITOR(obj);\n+\n+ g_free(mon->mon_cpu_path);\n+ qemu_chr_fe_deinit(&mon->chr, false);\n+ g_string_free(mon->outbuf, true);\n+ qemu_mutex_destroy(&mon->mon_lock);\n }\n \n static void monitor_class_init(ObjectClass *cls, const void *data)\n@@ -85,6 +91,11 @@ static void monitor_class_init(ObjectClass *cls, const void *data)\n \n static void monitor_init(Object *obj)\n {\n+ Monitor *mon = MONITOR(obj);\n+\n+ qemu_mutex_init(&mon->mon_lock);\n+ mon->is_qmp = !!object_dynamic_cast(obj, TYPE_MONITOR_QMP);\n+ mon->outbuf = g_string_new(NULL);\n }\n \n Monitor *monitor_cur(void)\n@@ -616,38 +627,16 @@ void monitor_list_append(Monitor *mon)\n qemu_mutex_unlock(&monitor_lock);\n \n if (mon) {\n- monitor_data_destroy(mon);\n object_unref(mon);\n }\n }\n \n-static void monitor_iothread_init(void)\n-{\n- mon_iothread = iothread_create(\"mon_iothread\", &error_abort);\n-}\n-\n-void monitor_data_init(Monitor *mon, bool is_qmp, bool use_io_thread)\n+void monitor_iothread_init(Monitor *mon)\n {\n- if (use_io_thread && !mon_iothread) {\n- monitor_iothread_init();\n+ if (!mon_iothread) {\n+ mon_iothread = iothread_create(\"mon_iothread\", &error_abort);\n }\n- qemu_mutex_init(&mon->mon_lock);\n- mon->is_qmp = is_qmp;\n- mon->outbuf = g_string_new(NULL);\n- mon->use_io_thread = use_io_thread;\n-}\n-\n-void monitor_data_destroy(Monitor *mon)\n-{\n- g_free(mon->mon_cpu_path);\n- qemu_chr_fe_deinit(&mon->chr, false);\n- if (monitor_is_qmp(mon)) {\n- monitor_data_destroy_qmp(container_of(mon, MonitorQMP, parent));\n- } else {\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+ mon->use_io_thread = true;\n }\n \n void monitor_cleanup(void)\n@@ -665,7 +654,7 @@ void monitor_cleanup(void)\n * Letting the iothread continue while shutting down the dispatcher\n * means that new requests may still be coming in. This is okay,\n * we'll just leave them in the queue without sending a response\n- * and monitor_data_destroy() will free them.\n+ * and object finalization will free them.\n */\n WITH_QEMU_LOCK_GUARD(&monitor_lock) {\n qmp_dispatcher_co_shutdown = true;\n@@ -679,8 +668,8 @@ void monitor_cleanup(void)\n /*\n * We need to explicitly stop the I/O thread (but not destroy it),\n * clean up the monitor resources, then destroy the I/O thread since\n- * we need to unregister from chardev below in\n- * monitor_data_destroy(), and chardev is not thread-safe yet\n+ * we need to unregister from chardev below in object\n+ * finalization, and chardev is not thread-safe yet\n */\n if (mon_iothread) {\n iothread_stop(mon_iothread);\n@@ -695,7 +684,6 @@ void monitor_cleanup(void)\n /* Permit QAPI event emission from character frontend release */\n qemu_mutex_unlock(&monitor_lock);\n monitor_flush(mon);\n- monitor_data_destroy(mon);\n qemu_mutex_lock(&monitor_lock);\n object_unref(mon);\n }\ndiff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c\nindex be2bd985b7..5be93eff4d 100644\n--- a/monitor/qmp-cmds.c\n+++ b/monitor/qmp-cmds.c\n@@ -168,8 +168,6 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n char *output = NULL;\n MonitorHMP *hmp = MONITOR_HMP(object_new(TYPE_MONITOR_HMP));\n \n- monitor_data_init(&hmp->parent, false, false);\n-\n if (has_cpu_index) {\n int ret = monitor_set_cpu(&hmp->parent, cpu_index);\n if (ret < 0) {\n@@ -186,7 +184,6 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n }\n \n out:\n- monitor_data_destroy(&hmp->parent);\n object_unref(hmp);\n return output;\n }\ndiff --git a/monitor/qmp.c b/monitor/qmp.c\nindex fe2aec9ce9..0de98b33fe 100644\n--- a/monitor/qmp.c\n+++ b/monitor/qmp.c\n@@ -73,8 +73,16 @@ QmpCommandList qmp_commands, qmp_cap_negotiation_commands;\n \n OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR);\n \n+static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon);\n+\n static void monitor_qmp_finalize(Object *obj)\n {\n+ MonitorQMP *mon = MONITOR_QMP(obj);\n+\n+ json_message_parser_destroy(&mon->parser);\n+ qemu_mutex_destroy(&mon->qmp_queue_lock);\n+ monitor_qmp_cleanup_req_queue_locked(mon);\n+ g_queue_free(mon->qmp_requests);\n }\n \n static void monitor_qmp_class_init(ObjectClass *cls, const void *data)\n@@ -505,14 +513,6 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)\n }\n }\n \n-void monitor_data_destroy_qmp(MonitorQMP *mon)\n-{\n- json_message_parser_destroy(&mon->parser);\n- qemu_mutex_destroy(&mon->qmp_queue_lock);\n- monitor_qmp_cleanup_req_queue_locked(mon);\n- g_queue_free(mon->qmp_requests);\n-}\n-\n static void monitor_qmp_setup_handlers_bh(void *opaque)\n {\n MonitorQMP *mon = opaque;\n@@ -538,8 +538,9 @@ void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)\n qemu_chr_fe_set_echo(&mon->parent.chr, true);\n \n /* Note: we run QMP monitor in I/O thread when @chr supports that */\n- monitor_data_init(&mon->parent, true,\n- qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));\n+ if (qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT)) {\n+ monitor_iothread_init(&mon->parent);\n+ }\n \n mon->pretty = pretty;\n \n","prefixes":["06/17"]}