Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2222018/?format=api
{ "id": 2222018, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2222018/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-5-berrange@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "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-5-berrange@redhat.com>", "date": "2026-04-10T16:04:45", "name": "[04/17] monitor: minimal conversion of monitors to QOM", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "584967279b6a9d309d320197c4eeb982c9cd8ed1", "submitter": { "id": 2694, "url": "http://patchwork.ozlabs.org/api/1.1/people/2694/?format=api", "name": "Daniel P. Berrangé", "email": "berrange@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-5-berrange@redhat.com/mbox/", "series": [ { "id": 499483, "url": "http://patchwork.ozlabs.org/api/1.1/series/499483/?format=api", "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/2222018/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2222018/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=ZROWaylr;\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 4fshVp4dW4z20HV\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 02:06:08 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wBEMm-0004BU-59; 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 <berrange@redhat.com>)\n id 1wBEMN-000405-3V\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:37 -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 <berrange@redhat.com>)\n id 1wBEMH-0006PA-FD\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:28 -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-22-1c2dT_ruOEGSoOPurpOvEw-1; Fri,\n 10 Apr 2026 12:05:20 -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 DBD6F19560B2; Fri, 10 Apr 2026 16:05:18 +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 895C5195608E; Fri, 10 Apr 2026 16:05:15 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837124;\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=RZ7iEy/LRT8y0xXnRA7qcfp+J9ER7E1IC6/AbgHspXo=;\n b=ZROWaylrLGLJ6WQ4iHMen4DdEG61SXGdrEd3E8noj6yHxraAQDLq/W6P86+33cIjkpwvYH\n GHPqxZPOcDw+BB7MpNwuuCdX/AQb5X3TPPWvzYpMWaZw9shOBsGaHHPv7fy5bxZLbqzXLv\n Ng+2OxStdGgSyDwtae1AzzjR/1xA8HM=", "X-MC-Unique": "1c2dT_ruOEGSoOPurpOvEw-1", "X-Mimecast-MFC-AGG-ID": "1c2dT_ruOEGSoOPurpOvEw_1775837119", "From": "=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "Paolo Bonzini <pbonzini@redhat.com>,\n Markus Armbruster <armbru@redhat.com>,\n Christian Brauner <brauner@kernel.org>,\n =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, =?utf-8?q?Philippe_M?=\n\t=?utf-8?q?athieu-Daud=C3=A9?= <philmd@linaro.org>,\n Fabiano Rosas <farosas@suse.de>,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Peter Xu <peterx@redhat.com>, Kevin Wolf <kwolf@redhat.com>, =?utf-8?q?Dani?=\n\t=?utf-8?q?el_P=2E_Berrang=C3=A9?= <berrange@redhat.com>,\n qemu-block@nongnu.org, \"Dr. David Alan Gilbert\" <dave@treblig.org>,\n Eric Blake <eblake@redhat.com>", "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;\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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "This introduces a Monitor QOM object, with MonitorHMP and\nMonitorQMP subclasses. This is the bare minimum conversion\nof just the type declarations and replacing g_new/g_free\nwith object_new/object_unref.\n\nSigned-off-by: Daniel P. Berrangé <berrange@redhat.com>\n---\n include/monitor/monitor.h | 11 ++++++++++-\n monitor/hmp.c | 18 ++++++++++++++++--\n monitor/monitor-internal.h | 18 ++++++++++++++++--\n monitor/monitor.c | 18 ++++++++++++++++--\n monitor/qmp-cmds.c | 15 ++++++++-------\n monitor/qmp.c | 18 ++++++++++++++++--\n 6 files changed, 82 insertions(+), 16 deletions(-)", "diff": "diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h\nindex bfbb440550..b349b12c34 100644\n--- a/include/monitor/monitor.h\n+++ b/include/monitor/monitor.h\n@@ -5,8 +5,17 @@\n #include \"qapi/qapi-types-misc.h\"\n #include \"qemu/readline.h\"\n #include \"exec/hwaddr.h\"\n+#include \"qom/object.h\"\n+\n+#define TYPE_MONITOR \"monitor\"\n+OBJECT_DECLARE_TYPE(Monitor, MonitorClass, MONITOR);\n+\n+#define TYPE_MONITOR_HMP \"monitor-hmp\"\n+OBJECT_DECLARE_TYPE(MonitorHMP, MonitorHMPClass, MONITOR_HMP);\n+\n+#define TYPE_MONITOR_QMP \"monitor-qmp\"\n+OBJECT_DECLARE_TYPE(MonitorQMP, MonitorQMPClass, MONITOR_QMP);\n \n-typedef struct MonitorHMP MonitorHMP;\n typedef struct MonitorOptions MonitorOptions;\n \n #define QMP_REQ_QUEUE_LEN_MAX 8\ndiff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 6dfeca84b5..614d9a3707 100644\n--- a/monitor/hmp.c\n+++ b/monitor/hmp.c\n@@ -42,6 +42,20 @@\n #include \"system/block-backend.h\"\n #include \"trace.h\"\n \n+OBJECT_DEFINE_TYPE(MonitorHMP, monitor_hmp, MONITOR_HMP, MONITOR);\n+\n+static void monitor_hmp_finalize(Object *obj)\n+{\n+}\n+\n+static void monitor_hmp_class_init(ObjectClass *cls, const void *data)\n+{\n+}\n+\n+static void monitor_hmp_init(Object *obj)\n+{\n+}\n+\n static void monitor_command_cb(void *opaque, const char *cmdline,\n void *readline_opaque)\n {\n@@ -1518,10 +1532,10 @@ static void monitor_readline_flush(void *opaque)\n \n void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n {\n- MonitorHMP *mon = g_new0(MonitorHMP, 1);\n+ MonitorHMP *mon = MONITOR_HMP(object_new(TYPE_MONITOR_HMP));\n \n if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n- g_free(mon);\n+ object_unref(mon);\n return;\n }\n \ndiff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex 0922588ad9..25320928a7 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -92,7 +92,13 @@ typedef struct HMPCommand {\n void (*command_completion)(ReadLineState *rs, int nb_args, const char *str);\n } HMPCommand;\n \n+\n+struct MonitorClass {\n+ ObjectClass parent_class;\n+};\n+\n struct Monitor {\n+ Object parent;\n CharFrontend chr;\n int suspend_cnt; /* Needs to be accessed atomically */\n bool is_qmp;\n@@ -118,6 +124,10 @@ struct Monitor {\n int reset_seen;\n };\n \n+struct MonitorHMPClass {\n+ MonitorClass parent_class;\n+};\n+\n struct MonitorHMP {\n Monitor parent;\n bool use_readline;\n@@ -131,7 +141,11 @@ struct MonitorHMP {\n ReadLineState *rs;\n };\n \n-typedef struct {\n+struct MonitorQMPClass {\n+ MonitorClass parent_class;\n+};\n+\n+struct MonitorQMP {\n Monitor parent;\n JSONMessageParser parser;\n bool pretty;\n@@ -151,7 +165,7 @@ typedef struct {\n QemuMutex qmp_queue_lock;\n /* Input queue that holds all the parsed QMP requests */\n GQueue *qmp_requests;\n-} MonitorQMP;\n+};\n \n /**\n * Is @mon a QMP monitor?\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 393fb7795e..7936e2ab22 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -73,6 +73,20 @@ static GHashTable *coroutine_mon; /* Maps Coroutine* to Monitor* */\n MonitorList mon_list;\n static bool monitor_destroyed;\n \n+OBJECT_DEFINE_TYPE(Monitor, monitor, MONITOR, OBJECT);\n+\n+static void monitor_finalize(Object *obj)\n+{\n+}\n+\n+static void monitor_class_init(ObjectClass *cls, const void *data)\n+{\n+}\n+\n+static void monitor_init(Object *obj)\n+{\n+}\n+\n Monitor *monitor_cur(void)\n {\n Monitor *mon;\n@@ -598,7 +612,7 @@ void monitor_list_append(Monitor *mon)\n \n if (mon) {\n monitor_data_destroy(mon);\n- g_free(mon);\n+ object_unref(mon);\n }\n }\n \n@@ -680,7 +694,7 @@ void monitor_cleanup(void)\n monitor_flush(mon);\n monitor_data_destroy(mon);\n qemu_mutex_lock(&monitor_lock);\n- g_free(mon);\n+ object_unref(mon);\n }\n qemu_mutex_unlock(&monitor_lock);\n \ndiff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c\nindex 191eba1b3a..d0ed241d6a 100644\n--- a/monitor/qmp-cmds.c\n+++ b/monitor/qmp-cmds.c\n@@ -166,12 +166,12 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n int64_t cpu_index, Error **errp)\n {\n char *output = NULL;\n- MonitorHMP hmp = {};\n+ MonitorHMP *hmp = MONITOR_HMP(object_new(TYPE_MONITOR_HMP));\n \n- monitor_data_init(&hmp.parent, 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.parent, 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@@ -179,14 +179,15 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,\n }\n }\n \n- handle_hmp_command(&hmp, command_line);\n+ handle_hmp_command(hmp, command_line);\n \n- WITH_QEMU_LOCK_GUARD(&hmp.parent.mon_lock) {\n- output = g_strdup(hmp.parent.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.parent);\n+ monitor_data_destroy(&hmp->parent);\n+ object_unref(hmp);\n return output;\n }\n \ndiff --git a/monitor/qmp.c b/monitor/qmp.c\nindex 9caee70624..36cb078f30 100644\n--- a/monitor/qmp.c\n+++ b/monitor/qmp.c\n@@ -71,6 +71,20 @@ typedef struct QMPRequest QMPRequest;\n \n QmpCommandList qmp_commands, qmp_cap_negotiation_commands;\n \n+OBJECT_DEFINE_TYPE(MonitorQMP, monitor_qmp, MONITOR_QMP, MONITOR);\n+\n+static void monitor_qmp_finalize(Object *obj)\n+{\n+}\n+\n+static void monitor_qmp_class_init(ObjectClass *cls, const void *data)\n+{\n+}\n+\n+static void monitor_qmp_init(Object *obj)\n+{\n+}\n+\n static bool qmp_oob_enabled(MonitorQMP *mon)\n {\n return mon->capab[QMP_CAPABILITY_OOB];\n@@ -515,10 +529,10 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)\n \n void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)\n {\n- MonitorQMP *mon = g_new0(MonitorQMP, 1);\n+ MonitorQMP *mon = MONITOR_QMP(object_new(TYPE_MONITOR_QMP));\n \n if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n- g_free(mon);\n+ object_unref(mon);\n return;\n }\n qemu_chr_fe_set_echo(&mon->parent.chr, true);\n", "prefixes": [ "04/17" ] }