{"id":2222027,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222027/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-14-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-14-berrange@redhat.com>","date":"2026-04-10T16:04:54","name":"[13/17] monitor: use dynamic cast in QMP commands","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e89e8ddb654edaef0e14729b4729babd37a259cb","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-14-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/2222027/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222027/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=ClsZrc8u;\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 4fshX14CGTz1yGb\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 02:07:13 +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 1wBENQ-0004iG-Sf; Fri, 10 Apr 2026 12:06:40 -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 1wBEN3-0004OO-3j\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:13 -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 1wBEMt-0006aI-47\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:04 -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-336-09KyhX6jN2qbnVACFwkQJg-1; Fri,\n 10 Apr 2026 12:05:59 -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 E3A4218002CA; Fri, 10 Apr 2026 16:05:57 +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 AAF52195608E; Fri, 10 Apr 2026 16:05:49 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837162;\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=B5YSyE20yiNgMLcsEyYg7aC+ZMO1FzYhYH7ZCCFrKes=;\n b=ClsZrc8u+T5U+KvL9kvm7oXi6wJBm2fz2fml671aAgZzDStBjgihpthu2i9M74NcRE4QmX\n An2L7lzxoSI9zK0hz/gOr+w7CSRX6M9B4XHiBz9cQsLMBP58HYqAVF7twmDNn3vOHndvx4\n 5u8eypJL71EwG54WMmUoIyFFbW57GQU=","X-MC-Unique":"09KyhX6jN2qbnVACFwkQJg-1","X-Mimecast-MFC-AGG-ID":"09KyhX6jN2qbnVACFwkQJg_1775837158","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 13/17] monitor: use dynamic cast in QMP commands","Date":"Fri, 10 Apr 2026 17:04:54 +0100","Message-ID":"<20260410160458.3778874-14-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":"-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_H2=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":"Rather than asserting monitor_is_qmp(), use a QOM cast via\nMONITOR_QMP which performs an assert already.\n\nSigned-off-by: Daniel P. Berrangé <berrange@redhat.com>\n---\n monitor/qmp-cmds-control.c | 12 ++----------\n 1 file changed, 2 insertions(+), 10 deletions(-)","diff":"diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c\nindex ca471bc1c7..8fe0876a3d 100644\n--- a/monitor/qmp-cmds-control.c\n+++ b/monitor/qmp-cmds-control.c\n@@ -72,11 +72,7 @@ static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list,\n void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,\n                           Error **errp)\n {\n-    Monitor *cur_mon = monitor_cur();\n-    MonitorQMP *mon;\n-\n-    assert(monitor_is_qmp(cur_mon));\n-    mon = container_of(cur_mon, MonitorQMP, parent);\n+    MonitorQMP *mon = MONITOR_QMP(monitor_cur());\n \n     if (mon->commands == &qmp_commands) {\n         error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,\n@@ -122,11 +118,7 @@ static void query_commands_cb(const QmpCommand *cmd, void *opaque)\n CommandInfoList *qmp_query_commands(Error **errp)\n {\n     CommandInfoList *list = NULL;\n-    Monitor *cur_mon = monitor_cur();\n-    MonitorQMP *mon;\n-\n-    assert(monitor_is_qmp(cur_mon));\n-    mon = container_of(cur_mon, MonitorQMP, parent);\n+    MonitorQMP *mon = MONITOR_QMP(monitor_cur());\n \n     qmp_for_each_command(mon->commands, query_commands_cb, &list);\n \n","prefixes":["13/17"]}