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 lists1p.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 10507C5DF7D for ; Tue, 18 Aug 2026 11:14:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wwHlv-0005p8-9B; Tue, 18 Aug 2026 07:14:23 -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 1wwHlt-0005oq-Ow for qemu-devel@nongnu.org; Tue, 18 Aug 2026 07:14:21 -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 1wwHls-00052M-6v for qemu-devel@nongnu.org; Tue, 18 Aug 2026 07:14:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787051659; 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=K50ZWGwg+nOOOt1h7W1bQ4V8OqkzKi0lDblUcZD8UUs=; b=ATBXWIsb5Sbpsjpvsc4ZixW3UO35YKE273ZBMagMb9trTkEcgx+kA37w48KUXtzFHvoJPo 5e9ILCDMDWtuUkBSeJuhI72LStKfgdiFskVZbeWU8pwDvRgrpBmWSQaZKjsuZ521MtVhHN OOth/Dm1xfVUCKNmE9+Ab1cgmttHMkU= 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-246-3hXRANe-MQu0PJ7JSypADA-1; Tue, 18 Aug 2026 07:14:15 -0400 X-MC-Unique: 3hXRANe-MQu0PJ7JSypADA-1 X-Mimecast-MFC-AGG-ID: 3hXRANe-MQu0PJ7JSypADA_1787051654 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 C05751955DC6; Tue, 18 Aug 2026 11:14:14 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 612871956042; Tue, 18 Aug 2026 11:13:58 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Tue, 18 Aug 2026 15:10:36 +0400 Subject: [PATCH v3 09/74] qom/qmp: populate qapi-type in QMP handlers MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260818-qom-qapi-v3-9-24b8bbbe3d86@redhat.com> References: <20260818-qom-qapi-v3-0-24b8bbbe3d86@redhat.com> In-Reply-To: <20260818-qom-qapi-v3-0-24b8bbbe3d86@redhat.com> To: qemu-devel@nongnu.org Cc: Markus Armbruster , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Michael Roth , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Developer-Signature: v=1; a=openpgp-sha256; l=3382; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=+8tJKKMSqC8bFdqLXJxWJDTuj8Fy49U/fprYdWbqUWM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqhD23zALu+CUNfu6VQ9HS23JsG1PvBWHQM7JLI zWR+TkttciJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaoQ9twAKCRDa6OEJdZac 5TqNEACkLIwYkojdSjC4Zj2UaHL/MH+4u7UTi+on71lVylAKDFxuNk3Gm+Bxpmd1ISYYFUfmY3E FWNEAZJJEMPCcHErC6z8sQQtLRxG4YkPo51JJE2xJU5fdivhfxSesOKcY6vVoIewgXfwl0IvTKD WETo3G4Mn8tsmPh5bEWZ7GqjnRY2u/1S8y9vlwJPqOgWVS8mzlMrlyaCzTTeGPVaoHvVTgPPAaT 1+QUlQKYZc7S7AfzIgn487tU8tg5HMAAQ9oP89TPoBx/fSDnHh/sWT/JMUSgz3LEzmlaVZPi+in lBs2USpc1yphjj/clH+YL/iRkRCZ50GNBCHnlllZJkCWLLyDibFQ0dp+mDWHb+nmzepYCNrOopC aGsSKVRWMI/SwHyJdtoyFh09+/hBiOqJwfiwEWPmlFJa1IVOwrm15S6LbQpRnmLJQMJEIccpT+r 4x7cqfLJcv7WlA2scX9OhVMjGm456ath8FFQaNmLnhksPnpjg7qr2u0On0gwFCuBDVeeANg49Eq CkwjFs2BoyBt6nLBui3lJSMN6Ab8Gx2D1QFr5pWr8nQTJ3psOuL9AEs7UwOCqp3vFV8rXRPwVH/ FlsWCfROlZwZoNSKEbrv4Qt5V+wnqWZUhOG8L90JjnxyU2GWE9bzlv4+sqlivlnDeyEmb3ugN46 pcrCnY/By4gEpGA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 9 X-Spam_score: 0.9 X-Spam_bar: / X-Spam_report: (0.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.343, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, 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 Wire up the new qapi-type field in all four QMP handlers that return ObjectPropertyInfo or ObjectPropertyValue: qom-list, qom-list-get, device-list-properties, and qom-list-properties. When an ObjectProperty has a qapi_type set, the masked QAPI type name is copied into the response, allowing clients to cross-reference with query-qmp-schema. No property has it yet, the following changes will populate it. Reviewed-by: Markus Armbruster Signed-off-by: Marc-André Lureau --- qom/qom-qmp-cmds.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 330895361d47..f9e6d4371cc5 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -25,9 +25,22 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qemu/cutils.h" +#include "qapi/qapi-type-info.h" #include "qom/object_interfaces.h" #include "qom/qom-qobject.h" +static ObjectPropertyInfo *qom_property_info(ObjectProperty *prop) +{ + ObjectPropertyInfo *info = g_new0(ObjectPropertyInfo, 1); + + info->name = g_strdup(prop->name); + info->type = g_strdup(prop->type); + if (prop->qapi_type) { + info->qapi_type = g_strdup(prop->qapi_type->masked_name); + } + return info; +} + static Object *qom_resolve_path(const char *path, Error **errp) { bool ambiguous = false; @@ -58,12 +71,7 @@ ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) object_property_iter_init(&iter, obj); while ((prop = object_property_iter_next(&iter))) { - ObjectPropertyInfo *value = g_new0(ObjectPropertyInfo, 1); - - QAPI_LIST_PREPEND(props, value); - - value->name = g_strdup(prop->name); - value->type = g_strdup(prop->type); + QAPI_LIST_PREPEND(props, qom_property_info(prop)); } return props; @@ -78,6 +86,9 @@ static void qom_list_add_property_value(Object *obj, ObjectProperty *prop, item->name = g_strdup(prop->name); item->type = g_strdup(prop->type); + if (prop->qapi_type) { + item->qapi_type = g_strdup(prop->qapi_type->masked_name); + } item->value = object_property_get_qobject(obj, prop->name, NULL); } @@ -218,9 +229,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, continue; } - info = g_new0(ObjectPropertyInfo, 1); - info->name = g_strdup(prop->name); - info->type = g_strdup(prop->type); + info = qom_property_info(prop); info->description = g_strdup(prop->description); info->default_value = qobject_ref(prop->defval); @@ -261,11 +270,8 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename, object_property_iter_init(&iter, obj); } while ((prop = object_property_iter_next(&iter))) { - ObjectPropertyInfo *info; + ObjectPropertyInfo *info = qom_property_info(prop); - info = g_malloc0(sizeof(*info)); - info->name = g_strdup(prop->name); - info->type = g_strdup(prop->type); info->description = g_strdup(prop->description); info->default_value = qobject_ref(prop->defval); -- 2.55.0.543.g5ebe2ebe4ea8