{"id":2222016,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222016/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-3-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-3-berrange@redhat.com>","date":"2026-04-10T16:04:43","name":"[02/17] monitor: replace 'common' with 'parent' in MonitorQMP","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1bc20090e635bf45933386de4daaf388285089bf","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-3-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/2222016/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222016/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=KjbTodag;\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 4fshVp4TtBz1yGb\n\tfor ; Sat, 11 Apr 2026 02:06:09 +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 1wBEMf-00043t-8p; Fri, 10 Apr 2026 12:05:50 -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 1wBEME-0003wx-SV\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:23 -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 1wBEMB-0006Nl-MF\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:21 -0400","from mx-prod-mc-01.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-287-FpMymekmMfiNwckxJoR7AQ-1; Fri,\n 10 Apr 2026 12:05:13 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 8C52D19560BB; Fri, 10 Apr 2026 16:05:11 +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 580E7195608E; Fri, 10 Apr 2026 16:05:08 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837118;\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=wOJHS8sN6JhZ4wgsDWCE9wWo4qgdFz7hBOvo57Z6mro=;\n b=KjbTodagl+hM7Ehc2yxMkLPFP1+fpmE1rN8H+3uTJzH8POsrJBJlagWzsxgfZMksSC2+4u\n J2a6UX++mbdRC0X/MHC0yy/h0aZeAiyd1mlYwtzzoTDB1JqBnaO12uqEQ8rsfpQHHFwQPi\n o67e/DlUl3d8hYW267fLA5S8iLnKG3A=","X-MC-Unique":"FpMymekmMfiNwckxJoR7AQ-1","X-Mimecast-MFC-AGG-ID":"FpMymekmMfiNwckxJoR7AQ_1775837111","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 02/17] monitor: replace 'common' with 'parent' in MonitorQMP","Date":"Fri, 10 Apr 2026 17:04:43 +0100","Message-ID":"<20260410160458.3778874-3-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":"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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n 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":"The field name 'parent' is standard practice for QOM structs\nso align the QMP monitor.\n\nSigned-off-by: Daniel P. Berrangé \n---\n monitor/monitor-internal.h | 2 +-\n monitor/monitor.c | 4 ++--\n monitor/qmp-cmds-control.c | 4 ++--\n monitor/qmp.c | 40 +++++++++++++++++++-------------------\n 4 files changed, 25 insertions(+), 25 deletions(-)","diff":"diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex ae0cf8c1da..0922588ad9 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -132,7 +132,7 @@ struct MonitorHMP {\n };\n \n typedef struct {\n- Monitor common;\n+ Monitor parent;\n JSONMessageParser parser;\n bool pretty;\n /*\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 6532796edb..6b183edcf5 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -308,7 +308,7 @@ static void monitor_qapi_event_emit(QAPIEvent event, QDict *qdict)\n continue;\n }\n \n- qmp_mon = container_of(mon, MonitorQMP, common);\n+ qmp_mon = container_of(mon, MonitorQMP, parent);\n {\n QEMU_LOCK_GUARD(&mon->mon_lock);\n if (qmp_mon->commands == &qmp_cap_negotiation_commands) {\n@@ -625,7 +625,7 @@ void monitor_data_destroy(Monitor *mon)\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, common));\n+ monitor_data_destroy_qmp(container_of(mon, MonitorQMP, parent));\n } else {\n readline_free(container_of(mon, MonitorHMP, parent)->rs);\n }\ndiff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c\nindex 150ca9f5cb..ca471bc1c7 100644\n--- a/monitor/qmp-cmds-control.c\n+++ b/monitor/qmp-cmds-control.c\n@@ -76,7 +76,7 @@ void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,\n MonitorQMP *mon;\n \n assert(monitor_is_qmp(cur_mon));\n- mon = container_of(cur_mon, MonitorQMP, common);\n+ mon = container_of(cur_mon, MonitorQMP, parent);\n \n if (mon->commands == &qmp_commands) {\n error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,\n@@ -126,7 +126,7 @@ CommandInfoList *qmp_query_commands(Error **errp)\n MonitorQMP *mon;\n \n assert(monitor_is_qmp(cur_mon));\n- mon = container_of(cur_mon, MonitorQMP, common);\n+ mon = container_of(cur_mon, MonitorQMP, parent);\n \n qmp_for_each_command(mon->commands, query_commands_cb, &list);\n \ndiff --git a/monitor/qmp.c b/monitor/qmp.c\nindex 687019811f..69d9e40e32 100644\n--- a/monitor/qmp.c\n+++ b/monitor/qmp.c\n@@ -80,7 +80,7 @@ static void monitor_qmp_caps_reset(MonitorQMP *mon)\n {\n memset(mon->capab_offered, 0, sizeof(mon->capab_offered));\n memset(mon->capab, 0, sizeof(mon->capab));\n- mon->capab_offered[QMP_CAPABILITY_OOB] = mon->common.use_io_thread;\n+ mon->capab_offered[QMP_CAPABILITY_OOB] = mon->parent.use_io_thread;\n }\n \n static void qmp_request_free(QMPRequest *req)\n@@ -124,7 +124,7 @@ static void monitor_qmp_cleanup_queue_and_resume(MonitorQMP *mon)\n * when we get here while the monitor is suspended. An\n * unfortunately timed CHR_EVENT_CLOSED can do the trick.\n */\n- monitor_resume(&mon->common);\n+ monitor_resume(&mon->parent);\n }\n \n }\n@@ -139,7 +139,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp)\n trace_monitor_qmp_respond(mon, json->str);\n \n g_string_append_c(json, '\\n');\n- monitor_puts(&mon->common, json->str);\n+ monitor_puts(&mon->parent, json->str);\n \n g_string_free(json, true);\n }\n@@ -166,7 +166,7 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)\n QDict *error;\n \n rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon),\n- &mon->common);\n+ &mon->parent);\n \n if (mon->commands == &qmp_cap_negotiation_commands) {\n error = qdict_get_qdict(rsp, \"error\");\n@@ -207,7 +207,7 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_lock(void)\n continue;\n }\n \n- qmp_mon = container_of(mon, MonitorQMP, common);\n+ qmp_mon = container_of(mon, MonitorQMP, parent);\n qemu_mutex_lock(&qmp_mon->qmp_queue_lock);\n req_obj = g_queue_pop_head(qmp_mon->qmp_requests);\n if (req_obj) {\n@@ -302,7 +302,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data)\n oob_enabled = qmp_oob_enabled(mon);\n if (oob_enabled\n && mon->qmp_requests->length == QMP_REQ_QUEUE_LEN_MAX - 1) {\n- monitor_resume(&mon->common);\n+ monitor_resume(&mon->parent);\n }\n \n /*\n@@ -343,7 +343,7 @@ void coroutine_fn monitor_qmp_dispatcher_co(void *data)\n }\n \n if (!oob_enabled) {\n- monitor_resume(&mon->common);\n+ monitor_resume(&mon->parent);\n }\n \n qmp_request_free(req_obj);\n@@ -408,7 +408,7 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err)\n */\n if (!qmp_oob_enabled(mon) ||\n mon->qmp_requests->length == QMP_REQ_QUEUE_LEN_MAX - 1) {\n- monitor_suspend(&mon->common);\n+ monitor_suspend(&mon->parent);\n }\n \n /*\n@@ -462,7 +462,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)\n \n switch (event) {\n case CHR_EVENT_OPENED:\n- WITH_QEMU_LOCK_GUARD(&mon->common.mon_lock) {\n+ WITH_QEMU_LOCK_GUARD(&mon->parent.mon_lock) {\n mon->commands = &qmp_cap_negotiation_commands;\n monitor_qmp_caps_reset(mon);\n }\n@@ -504,27 +504,27 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)\n MonitorQMP *mon = opaque;\n GMainContext *context;\n \n- assert(mon->common.use_io_thread);\n+ assert(mon->parent.use_io_thread);\n context = iothread_get_g_main_context(mon_iothread);\n assert(context);\n- qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read,\n+ qemu_chr_fe_set_handlers(&mon->parent.chr, monitor_can_read,\n monitor_qmp_read, monitor_qmp_event,\n- NULL, &mon->common, context, true);\n- monitor_list_append(&mon->common);\n+ NULL, &mon->parent, context, true);\n+ monitor_list_append(&mon->parent);\n }\n \n void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)\n {\n MonitorQMP *mon = g_new0(MonitorQMP, 1);\n \n- if (!qemu_chr_fe_init(&mon->common.chr, chr, errp)) {\n+ if (!qemu_chr_fe_init(&mon->parent.chr, chr, errp)) {\n g_free(mon);\n return;\n }\n- qemu_chr_fe_set_echo(&mon->common.chr, true);\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->common, true, false,\n+ monitor_data_init(&mon->parent, true, false,\n qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));\n \n mon->pretty = pretty;\n@@ -533,7 +533,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)\n mon->qmp_requests = g_queue_new();\n \n json_message_parser_init(&mon->parser, handle_qmp_command, mon, NULL);\n- if (mon->common.use_io_thread) {\n+ if (mon->parent.use_io_thread) {\n /*\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@@ -553,9 +553,9 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)\n monitor_qmp_setup_handlers_bh, mon);\n /* The bottom half will add @mon to @mon_list */\n } else {\n- qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read,\n+ qemu_chr_fe_set_handlers(&mon->parent.chr, monitor_can_read,\n monitor_qmp_read, monitor_qmp_event,\n- NULL, &mon->common, NULL, true);\n- monitor_list_append(&mon->common);\n+ NULL, &mon->parent, NULL, true);\n+ monitor_list_append(&mon->parent);\n }\n }\n","prefixes":["02/17"]}