From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0944FF459F8 for ; Fri, 10 Apr 2026 16:06:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBEMm-0004BU-59; Fri, 10 Apr 2026 12:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBEMN-000405-3V for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBEMH-0006PA-FD for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775837124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RZ7iEy/LRT8y0xXnRA7qcfp+J9ER7E1IC6/AbgHspXo=; b=ZROWaylrLGLJ6WQ4iHMen4DdEG61SXGdrEd3E8noj6yHxraAQDLq/W6P86+33cIjkpwvYH GHPqxZPOcDw+BB7MpNwuuCdX/AQb5X3TPPWvzYpMWaZw9shOBsGaHHPv7fy5bxZLbqzXLv Ng+2OxStdGgSyDwtae1AzzjR/1xA8HM= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-22-1c2dT_ruOEGSoOPurpOvEw-1; Fri, 10 Apr 2026 12:05:20 -0400 X-MC-Unique: 1c2dT_ruOEGSoOPurpOvEw-1 X-Mimecast-MFC-AGG-ID: 1c2dT_ruOEGSoOPurpOvEw_1775837119 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBD6F19560B2; Fri, 10 Apr 2026 16:05:18 +0000 (UTC) Received: from toolbx.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 895C5195608E; Fri, 10 Apr 2026 16:05:15 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Markus Armbruster , Christian Brauner , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Xu , Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Eric Blake Subject: [PATCH 04/17] monitor: minimal conversion of monitors to QOM Date: Fri, 10 Apr 2026 17:04:45 +0100 Message-ID: <20260410160458.3778874-5-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; envelope-from=berrange@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This introduces a Monitor QOM object, with MonitorHMP and MonitorQMP subclasses. This is the bare minimum conversion of just the type declarations and replacing g_new/g_free with object_new/object_unref. Signed-off-by: Daniel P. Berrangé --- include/monitor/monitor.h | 11 ++++++++++- monitor/hmp.c | 18 ++++++++++++++++-- monitor/monitor-internal.h | 18 ++++++++++++++++-- monitor/monitor.c | 18 ++++++++++++++++-- monitor/qmp-cmds.c | 15 ++++++++------- monitor/qmp.c | 18 ++++++++++++++++-- 6 files changed, 82 insertions(+), 16 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index bfbb440550..b349b12c34 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -5,8 +5,17 @@ #include "qapi/qapi-types-misc.h" #include "qemu/readline.h" #include "exec/hwaddr.h" +#include "qom/object.h" + +#define TYPE_MONITOR "monitor" +OBJECT_DECLARE_TYPE(Monitor, MonitorClass, MONITOR); + +#define TYPE_MONITOR_HMP "monitor-hmp" +OBJECT_DECLARE_TYPE(MonitorHMP, MonitorHMPClass, MONITOR_HMP); + +#define TYPE_MONITOR_QMP "monitor-qmp" +OBJECT_DECLARE_TYPE(MonitorQMP, MonitorQMPClass, MONITOR_QMP); -typedef struct MonitorHMP MonitorHMP; typedef struct MonitorOptions MonitorOptions; #define QMP_REQ_QUEUE_LEN_MAX 8 diff --git a/monitor/hmp.c b/monitor/hmp.c index 6dfeca84b5..614d9a3707 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -42,6 +42,20 @@ #include "system/block-backend.h" #include "trace.h" +OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP, MONITOR); + +static void monitor_hmp_finalize(Object *obj) +{ +} + +static void monitor_hmp_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_hmp_init(Object *obj) +{ +} + static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque) { @@ -1518,10 +1532,10 @@ static void monitor_readline_flush(void *opaque) void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp) { - MonitorHMP *mon = g_new0(MonitorHMP, 1); + MonitorHMP *mon = MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) { - g_free(mon); + object_unref(mon); return; } diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 0922588ad9..25320928a7 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -92,7 +92,13 @@ typedef struct HMPCommand { void (*command_completion)(ReadLineState *rs, int nb_args, const char *str); } HMPCommand; + +struct MonitorClass { + ObjectClass parent_class; +}; + struct Monitor { + Object parent; CharFrontend chr; int suspend_cnt; /* Needs to be accessed atomically */ bool is_qmp; @@ -118,6 +124,10 @@ struct Monitor { int reset_seen; }; +struct MonitorHMPClass { + MonitorClass parent_class; +}; + struct MonitorHMP { Monitor parent; bool use_readline; @@ -131,7 +141,11 @@ struct MonitorHMP { ReadLineState *rs; }; -typedef struct { +struct MonitorQMPClass { + MonitorClass parent_class; +}; + +struct MonitorQMP { Monitor parent; JSONMessageParser parser; bool pretty; @@ -151,7 +165,7 @@ typedef struct { QemuMutex qmp_queue_lock; /* Input queue that holds all the parsed QMP requests */ GQueue *qmp_requests; -} MonitorQMP; +}; /** * Is @mon a QMP monitor? diff --git a/monitor/monitor.c b/monitor/monitor.c index 393fb7795e..7936e2ab22 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -73,6 +73,20 @@ static GHashTable *coroutine_mon; /* Maps Coroutine* to Monitor* */ MonitorList mon_list; static bool monitor_destroyed; +OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT); + +static void monitor_finalize(Object *obj) +{ +} + +static void monitor_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_init(Object *obj) +{ +} + Monitor *monitor_cur(void) { Monitor *mon; @@ -598,7 +612,7 @@ void monitor_list_append(Monitor *mon) if (mon) { monitor_data_destroy(mon); - g_free(mon); + object_unref(mon); } } @@ -680,7 +694,7 @@ void monitor_cleanup(void) monitor_flush(mon); monitor_data_destroy(mon); qemu_mutex_lock(&monitor_lock); - g_free(mon); + object_unref(mon); } qemu_mutex_unlock(&monitor_lock); diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 191eba1b3a..d0ed241d6a 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -166,12 +166,12 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, int64_t cpu_index, Error **errp) { char *output = NULL; - MonitorHMP hmp = {}; + MonitorHMP *hmp = MONITOR_HMP(object_new(TYPE_MONITOR_HMP)); - monitor_data_init(&hmp.parent, false, true, false); + monitor_data_init(&hmp->parent, false, true, false); if (has_cpu_index) { - int ret = monitor_set_cpu(&hmp.parent, cpu_index); + int ret = monitor_set_cpu(&hmp->parent, cpu_index); if (ret < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); @@ -179,14 +179,15 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, } } - handle_hmp_command(&hmp, command_line); + handle_hmp_command(hmp, command_line); - WITH_QEMU_LOCK_GUARD(&hmp.parent.mon_lock) { - output = g_strdup(hmp.parent.outbuf->str); + WITH_QEMU_LOCK_GUARD(&hmp->parent.mon_lock) { + output = g_strdup(hmp->parent.outbuf->str); } out: - monitor_data_destroy(&hmp.parent); + monitor_data_destroy(&hmp->parent); + object_unref(hmp); return output; } diff --git a/monitor/qmp.c b/monitor/qmp.c index 9caee70624..36cb078f30 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -71,6 +71,20 @@ typedef struct QMPRequest QMPRequest; QmpCommandList qmp_commands, qmp_cap_negotiation_commands; +OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR); + +static void monitor_qmp_finalize(Object *obj) +{ +} + +static void monitor_qmp_class_init(ObjectClass *cls, const void *data) +{ +} + +static void monitor_qmp_init(Object *obj) +{ +} + static bool qmp_oob_enabled(MonitorQMP *mon) { return mon->capab[QMP_CAPABILITY_OOB]; @@ -515,10 +529,10 @@ static void monitor_qmp_setup_handlers_bh(void *opaque) void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp) { - MonitorQMP *mon = g_new0(MonitorQMP, 1); + MonitorQMP *mon = MONITOR_QMP(object_new(TYPE_MONITOR_QMP)); if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) { - g_free(mon); + object_unref(mon); return; } qemu_chr_fe_set_echo(&mon->parent.chr, true); -- 2.53.0