Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2222031/?format=api
{ "id": 2222031, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2222031/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-18-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-18-berrange@redhat.com>", "date": "2026-04-10T16:04:58", "name": "[17/17] FIXME: monitor: implement \"user creatable\" interface", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "acd488bd7596a50b324bf5c3ffcf85829f3b9ce7", "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-18-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/2222031/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2222031/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=DoHsgdCJ;\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 4fshXc4Sg5z1yGb\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 02:07:44 +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 1wBENX-0005J5-GE; Fri, 10 Apr 2026 12:06:43 -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 1wBEN9-0004Tq-0C\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:22 -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 <berrange@redhat.com>)\n id 1wBEN3-0006b4-9i\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:17 -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-365-OAqwXe0uNwGcXk2Lcwo2Xg-1; Fri,\n 10 Apr 2026 12:06:08 -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 6C43A18002DA; Fri, 10 Apr 2026 16:06:07 +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 404891956056; Fri, 10 Apr 2026 16:06:04 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837172;\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=tbI06disgDORwnFIFCnFNVYHgBOJm601Ay3torDHaWw=;\n b=DoHsgdCJJE4CU6DRdsXStICLLuxhrKjXQl81UtlwzGCEJfiiQd3X/AvJj0t3p3ukgsoEMK\n jACCg8/D8Xlb7E8JYUio+9ZKfhEWtWrjmYsy1tqakEkzxEKJQr2VJecVyyFd3jv31pQjz+\n YvkmwOWv0dPmUCEE8HJXzd1mfUt0GKs=", "X-MC-Unique": "OAqwXe0uNwGcXk2Lcwo2Xg-1", "X-Mimecast-MFC-AGG-ID": "OAqwXe0uNwGcXk2Lcwo2Xg_1775837167", "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 17/17] FIXME: monitor: implement \"user creatable\" interface", "Date": "Fri, 10 Apr 2026 17:04:58 +0100", "Message-ID": "<20260410160458.3778874-18-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 <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": "Implement the user creatable QOM interface and define the monitor-qmp\nand monitor-hmp types in QAPI. This unlocks the ability to create them\non the command line with -object or in HMP/QMP with object_add.\n\nFor example:\n\n $QEMU -chardev stdio,id=monchr0 -object monitor-hmp,id=mon0,chrdev=monchr0\n\nFIXME: object_del is NOT safe on monitors yet. Resolve against\nChristian's patches for monitor deletion & synchronization.\n\nSigned-off-by: Daniel P. Berrangé <berrange@redhat.com>\n---\n chardev/char.c | 10 +++++-\n gdbstub/system.c | 10 ++++--\n include/monitor/monitor.h | 2 --\n monitor/hmp.c | 73 ++++++++++++++++++++++++++++++--------\n monitor/monitor-internal.h | 2 ++\n monitor/monitor.c | 70 +++++++++++++++++++++++++++++-------\n monitor/qmp.c | 47 ++++++++++++++++++------\n qapi/qom.json | 43 ++++++++++++++++++++++\n stubs/monitor-internal.c | 4 ---\n system/vl.c | 8 ++++-\n 10 files changed, 222 insertions(+), 47 deletions(-)", "diff": "diff --git a/chardev/char.c b/chardev/char.c\nindex b59972f325..42eb799d78 100644\n--- a/chardev/char.c\n+++ b/chardev/char.c\n@@ -785,8 +785,16 @@ static Chardev *qemu_chr_new_from_name(const char *label, const char *filename,\n }\n \n if (qemu_opt_get_bool(opts, \"mux\", 0)) {\n+ const char *cdevid = qemu_opts_id(opts);\n+ const char *monid = g_strdup_printf(\"mon%s\", cdevid);\n assert(permit_mux_mon);\n- monitor_new_hmp(chr, true, &err);\n+ object_new_with_props(TYPE_MONITOR_HMP,\n+ object_get_objects_root(),\n+ monid,\n+ &err,\n+ \"chrdev\", cdevid,\n+ \"readline\", \"yes\",\n+ NULL);\n if (err) {\n error_report_err(err);\n object_unparent(OBJECT(chr));\ndiff --git a/gdbstub/system.c b/gdbstub/system.c\nindex 20dcf7878d..03b7bbeffc 100644\n--- a/gdbstub/system.c\n+++ b/gdbstub/system.c\n@@ -386,9 +386,15 @@ bool gdbserver_start(const char *device, Error **errp)\n qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL);\n \n /* Initialize a monitor terminal for gdb */\n- mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB,\n+ mon_chr = qemu_chardev_new(\"gdbchrdev0\", TYPE_CHARDEV_GDB,\n NULL, NULL, &error_abort);\n- monitor_new_hmp(mon_chr, false, &error_abort);\n+ object_new_with_props(TYPE_MONITOR_HMP,\n+ object_get_objects_root(),\n+ \"gdbmon0\",\n+ &error_abort,\n+ \"chrdev\", \"gdbchrdev0\",\n+ \"readline\", \"no\",\n+ NULL);\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 52df053c6d..dc7f0d0b48 100644\n--- a/include/monitor/monitor.h\n+++ b/include/monitor/monitor.h\n@@ -28,8 +28,6 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon);\n \n void monitor_init_globals(void);\n void monitor_init_globals_core(void);\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);\ndiff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 387dab2567..02d3ebf7b4 100644\n--- a/monitor/hmp.c\n+++ b/monitor/hmp.c\n@@ -38,6 +38,8 @@\n #include \"qemu/option.h\"\n #include \"qemu/target-info.h\"\n #include \"qemu/units.h\"\n+#include \"qapi/error.h\"\n+#include \"qom/object_interfaces.h\"\n #include \"exec/gdbstub.h\"\n #include \"system/block-backend.h\"\n #include \"trace.h\"\n@@ -54,16 +56,47 @@ int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)\n G_GNUC_PRINTF(2, 0);\n static void monitor_hmp_accept_input(Monitor *mon);\n \n+static bool monitor_hmp_get_readline(Object *obj, Error **errp)\n+{\n+ MonitorHMP *mon = MONITOR_HMP(obj);\n+\n+ return mon->readline;\n+}\n+\n+static void monitor_hmp_set_readline(Object *obj, bool val, Error **errp)\n+{\n+ MonitorHMP *mon = MONITOR_HMP(obj);\n+\n+ mon->readline = val;\n+}\n+\n+static void monitor_hmp_complete(UserCreatable *uc, Error **errp);\n+\n static void monitor_hmp_class_init(ObjectClass *cls, const void *data)\n {\n MonitorClass *moncls = MONITOR_CLASS(cls);\n+ UserCreatableClass *ucc = USER_CREATABLE_CLASS(cls);\n+\n+ object_class_property_add_bool(cls, \"readline\",\n+ monitor_hmp_get_readline,\n+ monitor_hmp_set_readline);\n \n moncls->vprintf = monitor_hmp_vprintf;\n moncls->accept_input = monitor_hmp_accept_input;\n+\n+ ucc->complete = monitor_hmp_complete;\n }\n \n static void monitor_hmp_init(Object *obj)\n {\n+ MonitorHMP *hmp = MONITOR_HMP(obj);\n+\n+ /*\n+ * Default to common case for external HMP use,\n+ * as opposed to non-interactive internal use\n+ * from gdbstub\n+ */\n+ hmp->readline = true;\n }\n \n int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)\n@@ -1565,26 +1598,36 @@ static void monitor_readline_flush(void *opaque)\n monitor_flush(&mon->parent);\n }\n \n-void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n+static void monitor_hmp_complete(UserCreatable *uc, Error **errp)\n {\n- MonitorHMP *mon = MONITOR_HMP(object_new(TYPE_MONITOR_HMP));\n-\n- if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n- object_unref(mon);\n+ MonitorHMP *mon = MONITOR_HMP(uc);\n+ UserCreatableClass *ucc_parent =\n+ USER_CREATABLE_CLASS(\n+ object_class_get_parent(\n+ OBJECT_CLASS(MONITOR_HMP_GET_CLASS(mon))));\n+ ERRP_GUARD();\n+\n+ ucc_parent->complete(uc, errp);\n+ if (*errp) {\n return;\n }\n \n- if (use_readline) {\n- mon->rs = readline_init(monitor_readline_printf,\n- monitor_readline_flush,\n- mon,\n- monitor_find_completion);\n- monitor_read_command(mon, 0);\n- }\n+ if (mon->parent.chrdev_id) {\n+ if (mon->readline) {\n+ mon->rs = readline_init(monitor_readline_printf,\n+ monitor_readline_flush,\n+ mon,\n+ monitor_find_completion);\n+ monitor_read_command(mon, 0);\n+ }\n \n- qemu_chr_fe_set_handlers(&mon->parent.chr, monitor_can_read, monitor_read,\n- monitor_event, NULL, &mon->parent, NULL, true);\n- monitor_list_append(&mon->parent);\n+ qemu_chr_fe_set_handlers(&mon->parent.chr,\n+ monitor_can_read,\n+ monitor_read,\n+ monitor_event, NULL,\n+ &mon->parent, NULL, true);\n+ monitor_list_append(&mon->parent);\n+ }\n }\n \n /**\ndiff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex 7557deb978..200f3ac284 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -104,6 +104,7 @@ struct MonitorClass {\n \n struct Monitor {\n Object parent;\n+ char *chrdev_id;\n CharFrontend chr;\n int suspend_cnt; /* Needs to be accessed atomically */\n bool use_io_thread;\n@@ -133,6 +134,7 @@ struct MonitorHMPClass {\n \n struct MonitorHMP {\n Monitor parent;\n+ bool readline;\n /*\n * State used only in the thread \"owning\" the monitor.\n * If @use_io_thread, this is @mon_iothread. (This does not actually happen\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 3860486a32..bbc234d683 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -29,6 +29,7 @@\n #include \"qapi/qapi-emit-events.h\"\n #include \"qapi/qapi-visit-control.h\"\n #include \"qobject/qdict.h\"\n+#include \"qom/object_interfaces.h\"\n #include \"qemu/error-report.h\"\n #include \"qemu/option.h\"\n #include \"system/qtest.h\"\n@@ -73,7 +74,8 @@ 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+OBJECT_DEFINE_TYPE_EXTENDED(Monitor, monitor, MONITOR, OBJECT, true,\n+ { TYPE_USER_CREATABLE }, {});\n \n static void monitor_finalize(Object *obj)\n {\n@@ -85,8 +87,45 @@ static void monitor_finalize(Object *obj)\n qemu_mutex_destroy(&mon->mon_lock);\n }\n \n+static void monitor_complete(UserCreatable *uc, Error **errp)\n+{\n+ Monitor *mon = MONITOR(uc);\n+\n+ if (mon->chrdev_id) {\n+ Chardev *chr = qemu_chr_find(mon->chrdev_id);\n+ if (chr == NULL) {\n+ error_setg(errp, \"chardev \\\"%s\\\" not found\", mon->chrdev_id);\n+ return;\n+ }\n+\n+ if (!qemu_chr_fe_init(&mon->chr, chr, errp)) {\n+ return;\n+ }\n+ }\n+}\n+\n+static char *monitor_get_chrdev_id(Object *obj, Error **errp)\n+{\n+ Monitor *mon = MONITOR(obj);\n+\n+ return g_strdup(mon->chrdev_id);\n+}\n+\n+static void monitor_set_chrdev_id(Object *obj, const char *str, Error **errp)\n+{\n+ Monitor *mon = MONITOR(obj);\n+\n+ mon->chrdev_id = g_strdup(str);\n+}\n+\n static void monitor_class_init(ObjectClass *cls, const void *data)\n {\n+ UserCreatableClass *ucc = USER_CREATABLE_CLASS(cls);\n+\n+ object_class_property_add_str(cls, \"chrdev\",\n+ monitor_get_chrdev_id, monitor_set_chrdev_id);\n+\n+ ucc->complete = monitor_complete;\n }\n \n static void monitor_init(Object *obj)\n@@ -570,7 +609,7 @@ void monitor_list_append(Monitor *mon)\n qemu_mutex_unlock(&monitor_lock);\n \n if (mon) {\n- object_unref(mon);\n+ object_unparent(OBJECT(mon));\n }\n }\n \n@@ -628,7 +667,7 @@ void monitor_cleanup(void)\n qemu_mutex_unlock(&monitor_lock);\n monitor_flush(mon);\n qemu_mutex_lock(&monitor_lock);\n- object_unref(mon);\n+ object_unparent(OBJECT(mon));\n }\n qemu_mutex_unlock(&monitor_lock);\n \n@@ -666,13 +705,8 @@ void monitor_init_globals(void)\n int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp)\n {\n ERRP_GUARD();\n- Chardev *chr;\n-\n- chr = qemu_chr_find(opts->chardev);\n- if (chr == NULL) {\n- error_setg(errp, \"chardev \\\"%s\\\" not found\", opts->chardev);\n- return -1;\n- }\n+ static int counter;\n+ g_autofree char *id = g_strdup_printf(\"mon%d\", counter++);\n \n if (!opts->has_mode) {\n opts->mode = allow_hmp ? MONITOR_MODE_READLINE : MONITOR_MODE_CONTROL;\n@@ -680,7 +714,13 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp)\n \n switch (opts->mode) {\n case MONITOR_MODE_CONTROL:\n- monitor_new_qmp(chr, opts->pretty, errp);\n+ object_new_with_props(TYPE_MONITOR_QMP,\n+ object_get_objects_root(),\n+ id,\n+ errp,\n+ \"chrdev\", opts->chardev,\n+ \"pretty\", opts->pretty ? \"yes\" : \"no\",\n+ NULL);\n break;\n case MONITOR_MODE_READLINE:\n if (!allow_hmp) {\n@@ -691,7 +731,13 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp)\n error_setg(errp, \"'pretty' is not compatible with HMP monitors\");\n return -1;\n }\n- monitor_new_hmp(chr, true, errp);\n+ object_new_with_props(TYPE_MONITOR_HMP,\n+ object_get_objects_root(),\n+ id,\n+ errp,\n+ \"chrdev\", opts->chardev,\n+ \"readline\", \"yes\",\n+ NULL);\n break;\n default:\n g_assert_not_reached();\ndiff --git a/monitor/qmp.c b/monitor/qmp.c\nindex 2ec9cca3a6..8fbc55757c 100644\n--- a/monitor/qmp.c\n+++ b/monitor/qmp.c\n@@ -31,6 +31,7 @@\n #include \"qobject/qdict.h\"\n #include \"qobject/qjson.h\"\n #include \"qobject/qlist.h\"\n+#include \"qom/object_interfaces.h\"\n #include \"trace.h\"\n \n /*\n@@ -85,13 +86,35 @@ static void monitor_qmp_finalize(Object *obj)\n g_queue_free(mon->qmp_requests);\n }\n \n+static bool monitor_qmp_get_pretty(Object *obj, Error **errp)\n+{\n+ MonitorQMP *mon = MONITOR_QMP(obj);\n+\n+ return mon->pretty;\n+}\n+\n+static void monitor_qmp_set_pretty(Object *obj, bool val, Error **errp)\n+{\n+ MonitorQMP *mon = MONITOR_QMP(obj);\n+\n+ mon->pretty = val;\n+}\n+\n static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *qdict);\n+static void monitor_qmp_complete(UserCreatable *uc, Error **errp);\n \n static void monitor_qmp_class_init(ObjectClass *cls, const void *data)\n {\n MonitorClass *moncls = MONITOR_CLASS(cls);\n+ UserCreatableClass *ucc = USER_CREATABLE_CLASS(cls);\n+\n+ object_class_property_add_bool(cls, \"pretty\",\n+ monitor_qmp_get_pretty,\n+ monitor_qmp_set_pretty);\n \n moncls->emit_event = monitor_qmp_emit_event;\n+\n+ ucc->complete = monitor_qmp_complete;\n }\n \n static void monitor_qmp_init(Object *obj)\n@@ -547,23 +570,27 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)\n monitor_list_append(&mon->parent);\n }\n \n-void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)\n+static void monitor_qmp_complete(UserCreatable *uc, Error **errp)\n {\n- MonitorQMP *mon = MONITOR_QMP(object_new(TYPE_MONITOR_QMP));\n-\n- if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n- object_unref(mon);\n+ MonitorQMP *mon = MONITOR_QMP(uc);\n+ UserCreatableClass *ucc_parent =\n+ USER_CREATABLE_CLASS(\n+ object_class_get_parent(\n+ OBJECT_CLASS(MONITOR_QMP_GET_CLASS(mon))));\n+ ERRP_GUARD();\n+\n+ ucc_parent->complete(uc, errp);\n+ if (*errp) {\n return;\n }\n+\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- if (qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT)) {\n+ if (qemu_chr_has_feature(mon->parent.chr.chr, QEMU_CHAR_FEATURE_GCONTEXT)) {\n monitor_iothread_init(&mon->parent);\n }\n \n- mon->pretty = pretty;\n-\n qemu_mutex_init(&mon->qmp_queue_lock);\n mon->qmp_requests = g_queue_new();\n \n@@ -573,12 +600,12 @@ void monitor_new_qmp(Chardev *chr, bool pretty, Error **errp)\n * Make sure the old iowatch is gone. It's possible when\n * e.g. the chardev is in client mode, with wait=on.\n */\n- remove_fd_in_watch(chr);\n+ remove_fd_in_watch(mon->parent.chr.chr);\n /*\n * Clean up listener IO sources early to prevent racy fd\n * handling between the main thread and the I/O thread.\n */\n- remove_listener_fd_in_watch(chr);\n+ remove_listener_fd_in_watch(mon->parent.chr.chr);\n /*\n * We can't call qemu_chr_fe_set_handlers() directly here\n * since chardev might be running in the monitor I/O\ndiff --git a/qapi/qom.json b/qapi/qom.json\nindex c653248f85..53264bcd7b 100644\n--- a/qapi/qom.json\n+++ b/qapi/qom.json\n@@ -1179,6 +1179,45 @@\n 'data': { '*cpu-affinity': ['uint16'],\n '*node-affinity': ['uint16'] } }\n \n+##\n+# @MonitorProperties:\n+#\n+# Properties for all monitors\n+#\n+# @chrdev: ID of the character device providing the monitor transport\n+#\n+# Since: 11.1\n+##\n+{ 'struct': 'MonitorProperties',\n+ 'data': { 'chrdev': 'str' }}\n+\n+##\n+# @MonitorHMPProperties:\n+#\n+# Properties for the HMP monitor\n+#\n+# @readline: whether to enable readline for interactive command\n+# usage (default: enabled)\n+#\n+# Since: 11.1\n+##\n+{ 'struct': 'MonitorHMPProperties',\n+ 'base': 'MonitorProperties',\n+ 'data': { '*readline': 'bool' } }\n+\n+##\n+# @MonitorQMPProperties:\n+#\n+# Properties for the QMP monitor\n+#\n+# @pretty: whether to pretty print JSON responses (default: disabled)\n+#\n+# Since: 11.1\n+##\n+{ 'struct': 'MonitorQMPProperties',\n+ 'base': 'MonitorProperties',\n+ 'data': { '*pretty': 'bool' } }\n+\n ##\n # @ObjectType:\n #\n@@ -1229,6 +1268,8 @@\n 'memory-backend-ram',\n { 'name': 'memory-backend-shm',\n 'if': 'CONFIG_POSIX' },\n+ 'monitor-hmp',\n+ 'monitor-qmp',\n 'pef-guest',\n { 'name': 'pr-manager-helper',\n 'if': 'CONFIG_LINUX' },\n@@ -1307,6 +1348,8 @@\n 'memory-backend-ram': 'MemoryBackendProperties',\n 'memory-backend-shm': { 'type': 'MemoryBackendShmProperties',\n 'if': 'CONFIG_POSIX' },\n+ 'monitor-hmp': {'type': 'MonitorHMPProperties' },\n+ 'monitor-qmp': {'type': 'MonitorQMPProperties' },\n 'pr-manager-helper': { 'type': 'PrManagerHelperProperties',\n 'if': 'CONFIG_LINUX' },\n 'qtest': 'QtestProperties',\ndiff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c\nindex 23d58da184..cbec2f35e0 100644\n--- a/stubs/monitor-internal.c\n+++ b/stubs/monitor-internal.c\n@@ -7,7 +7,3 @@ int monitor_get_fd(Monitor *mon, const char *name, Error **errp)\n error_setg(errp, \"only QEMU supports file descriptor passing\");\n return -1;\n }\n-\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 2391811a46..e772e1401f 100644\n--- a/system/vl.c\n+++ b/system/vl.c\n@@ -1823,6 +1823,10 @@ static void object_option_add_visitor(Visitor *v)\n {\n ObjectOption *opt = g_new0(ObjectOption, 1);\n visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal);\n+ if (opt->opts->qom_type == OBJECT_TYPE_MONITOR_HMP ||\n+ opt->opts->qom_type == OBJECT_TYPE_MONITOR_QMP) {\n+ default_monitor = 0;\n+ }\n QTAILQ_INSERT_TAIL(&object_opts, opt, next);\n }\n \n@@ -1964,7 +1968,9 @@ static bool object_create_early(const char *type)\n \n /* Reason: property \"chardev\" */\n if (g_str_equal(type, \"rng-egd\") ||\n- g_str_equal(type, \"qtest\")) {\n+ g_str_equal(type, \"qtest\") ||\n+ g_str_equal(type, \"monitor-hmp\") ||\n+ g_str_equal(type, \"monitor-qmp\")) {\n return false;\n }\n \n", "prefixes": [ "17/17" ] }