From patchwork Mon Mar 3 21:09:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999509 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 lists.gnu.org (lists.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 39D9AC282CD for ; Mon, 3 Mar 2025 21:10:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3J-0008TU-Ox; Mon, 03 Mar 2025 16:10:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3I-0008Sl-4t for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:16 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3F-0008Js-Fi for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:15 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523Jfh01024361; Mon, 3 Mar 2025 21:10:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=tmuIQKf+LVR9RSQKG+1LL6QxmOnH2kHU/hydALtZnBs=; b= aR7i1aAEJDKsKs2dSmylqS+knqQDFdbKP8s6cpVFtElnt+qtPvFkqjh1R0R58R8Z 8ikp7qR9rHdA6OHDVCrfZ1wOJMYkx1+6o5AykZ234y4uS2wsb48YogIHQ9zwEJkw uQdxhnIhmBAk/SSJgqbE4vofYYeHdeTB1OaP/wdb4llceikTlGQhXrnn2Uzyr290 OgA/7b7LZTbGUIeq55aLr9Bc6nxVe1RgYXjFsY9y8TCusIqmMRBsVKIvQX296i3B rKH4olbxS4f/D/cYhmUEf9hAMa9yOGbK+s2xnuBZ+h3e6eFaWKO7praUjS6XtXrh mhFodbxiFr7en27RTXcjOg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453u81un6k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:07 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523JtIA6003167; Mon, 3 Mar 2025 21:10:06 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q0q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:06 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Ie022708; Mon, 3 Mar 2025 21:10:05 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-2; Mon, 03 Mar 2025 21:10:05 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 1/6] qom: qom_resolve_path Date: Mon, 3 Mar 2025 13:09:57 -0800 Message-Id: <1741036202-265696-2-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-GUID: _lIchtoz_8ETXjmwG9RPp0EzLHHMmwvk X-Proofpoint-ORIG-GUID: _lIchtoz_8ETXjmwG9RPp0EzLHHMmwvk Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Factor out a helper to resolve the user's path and print error messages. No functional change. Signed-off-by: Steve Sistare --- qom/qom-qmp-cmds.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index e866547..293755f 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -28,15 +28,11 @@ #include "qom/object_interfaces.h" #include "qom/qom-qobject.h" -ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) +static Object *qom_resolve_path(const char *path, Error **errp) { - Object *obj; bool ambiguous = false; - ObjectPropertyInfoList *props = NULL; - ObjectProperty *prop; - ObjectPropertyIterator iter; + Object *obj = object_resolve_path(path, &ambiguous); - obj = object_resolve_path(path, &ambiguous); if (obj == NULL) { if (ambiguous) { error_setg(errp, "Path '%s' is ambiguous", path); @@ -44,6 +40,19 @@ ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", path); } + } + return obj; +} + +ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) +{ + Object *obj; + ObjectPropertyInfoList *props = NULL; + ObjectProperty *prop; + ObjectPropertyIterator iter; + + obj = qom_resolve_path(path, errp); + if (obj == NULL) { return NULL; } From patchwork Mon Mar 3 21:09:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999514 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 lists.gnu.org (lists.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 C4311C282C6 for ; Mon, 3 Mar 2025 21:11:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3L-0008UC-4m; Mon, 03 Mar 2025 16:10:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3I-0008Sz-GE for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:16 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3F-0008LM-Kr for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:16 -0500 Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523Jfj7o001862; Mon, 3 Mar 2025 21:10:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=XWn/yl+IYSyCxLcwU+QNkD8Plx1teZJqFh96mmzQUcY=; b= O9puZOvXozIFE3SPjqLPkopUgcZcb2lMs8x/M2mozXCUAuFwATPm3+i71vKDevMS vh9Bi0TpA7WBhuyM6IwvJgqEUO7yGyIRh6jwb8Mv4AUVbpiowdoozrrhyr8rdwoD vy8N0MZ93q26IMNeWKi+mdsZ5BPADhHDAXqT+ivm6pXdY860lj+1dLurnN/9qK2U LNVQA8oRbow37FjnSNcPyacl9cT4GhrwxPQrUZ0XRMnN0zj0k0tElcqtAD9XX+KS cRYGflYpOoNSWoxHLaveywJaOhyqL9PBmTaIlQA2NrtWY3A6K/nC69CCRN8F0Y1j XkJkuYkk3lB2yrrWo4DIVA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453uavumag-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:10 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523JsFwZ003199; Mon, 3 Mar 2025 21:10:09 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:09 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Ig022708; Mon, 3 Mar 2025 21:10:08 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-3; Mon, 03 Mar 2025 21:10:08 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 2/6] qom: qom-tree-get Date: Mon, 3 Mar 2025 13:09:58 -0800 Message-Id: <1741036202-265696-3-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-GUID: nu9-l-LA__8pGOCRWUA_qN-grRdzGocd X-Proofpoint-ORIG-GUID: nu9-l-LA__8pGOCRWUA_qN-grRdzGocd Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Define the qom-tree-get QAPI command, which fetches an entire tree of properties and values with a single QAPI call. This is much faster than using qom-list plus qom-get for every node and property of the tree. See qom.json for details. Signed-off-by: Steve Sistare --- qapi/qom.json | 59 ++++++++++++++++++++++++++++++++++++++++++++++ qom/qom-qmp-cmds.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/qapi/qom.json b/qapi/qom.json index 28ce24c..646e3c6 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -46,6 +46,41 @@ '*default-value': 'any' } } ## +# @ObjectPropertyValue: +# +# @name: the name of the property +# +# @type: the type of the property, as described in @ObjectPropertyInfo +# +# @value: the value of the property +# +# @error: error message if value cannot be fetched +# +# Since 10.0 +## +{ 'struct': 'ObjectPropertyValue', + 'data': { 'name': 'str', + 'type': 'str', + '*value': 'any', + '*error': 'str' } } + +## +# @ObjectNode: +# +# @name: the name of the node +# +# @children: child nodes +# +# @properties: properties of the node +# +# Since 10.0 +## +{ 'struct': 'ObjectNode', + 'data': { 'name': 'str', + 'children': [ 'ObjectNode' ], + 'properties': [ 'ObjectPropertyValue' ] }} + +## # @qom-list: # # This command will list any properties of a object given a path in @@ -126,6 +161,30 @@ 'allow-preconfig': true } ## +# @qom-tree-get: +# +# This command returns a tree of objects and their properties, +# rooted at the specified path. +# +# @path: The absolute or partial path within the object model, as +# described in @qom-get +# +# Errors: +# - If path is not valid or is ambiguous, returns an error. +# - If a property cannot be read, returns an error message in the +# corresponding @ObjectPropertyValue. +# +# Returns: A tree of @ObjectNode. Each node contains its name, list +# of properties, and list of child nodes. +# +# Since 10.0 +## +{ 'command': 'qom-tree-get', + 'data': { 'path': 'str' }, + 'returns': 'ObjectNode', + 'allow-preconfig': true } + +## # @qom-set: # # This command will set a property from a object model path. diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 293755f..271f62d 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -69,6 +69,75 @@ ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) return props; } +static void qom_list_add_property_value(Object *obj, ObjectProperty *prop, + ObjectPropertyValueList **props) +{ + ObjectPropertyValue *item = g_new0(ObjectPropertyValue, 1); + Error *err = NULL; + + QAPI_LIST_PREPEND(*props, item); + + item->name = g_strdup(prop->name); + item->type = g_strdup(prop->type); + item->value = object_property_get_qobject(obj, prop->name, &err); + + if (!item->value) { + item->error = g_strdup(error_get_pretty(err)); + error_free(err); + } +} + +static ObjectNode *qom_tree_get(const char *path, Error **errp) +{ + Object *obj; + ObjectProperty *prop; + ObjectNode *result, *child; + ObjectPropertyIterator iter; + + obj = qom_resolve_path(path, errp); + if (obj == NULL) { + return NULL; + } + + result = g_new0(ObjectNode, 1); + + object_property_iter_init(&iter, obj); + while ((prop = object_property_iter_next(&iter))) { + if (strstart(prop->type, "child<", NULL)) { + g_autofree char *child_path = g_strdup_printf("%s/%s", + path, prop->name); + child = qom_tree_get(child_path, errp); + if (!child) { + qapi_free_ObjectNode(result); + return NULL; + } + child->name = g_strdup(prop->name); + QAPI_LIST_PREPEND(result->children, child); + } else { + qom_list_add_property_value(obj, prop, &result->properties); + } + } + + return result; +} + +ObjectNode *qmp_qom_tree_get(const char *path, Error **errp) +{ + ObjectNode *result = qom_tree_get(path, errp); + + if (result) { + /* Strip the path prefix if any */ + const char *basename = strrchr(path, '/'); + + if (!basename || !basename[1]) { + result->name = g_strdup(path); + } else { + result->name = g_strdup(basename + 1); + } + } + return result; +} + void qmp_qom_set(const char *path, const char *property, QObject *value, Error **errp) { From patchwork Mon Mar 3 21:09:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999508 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 lists.gnu.org (lists.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 36DFDC282C6 for ; Mon, 3 Mar 2025 21:10:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3L-0008UB-2T; Mon, 03 Mar 2025 16:10:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3I-0008T6-NY for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:16 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3G-0008M5-F5 for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:16 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523Jfhqh024364; Mon, 3 Mar 2025 21:10:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=mVjoSD1a74QPF4osoDZrnFim+5AI3lM1u0kQ95TMG+k=; b= e96IhSrxXOxIYL6K7Cxu7pszrP0t/LH0xu/S8chJbgA5XqlV+NeloJHi3QDXVqdx Uu1WCJQ+JvoWSdvWB+PJ1pWf4odcziyCg5Aa4BsK5bNj4FgMo2IYlCQNj5OrA1HP USJUK76RDctqXFg1d1uJezSumCUGnEXMUfbG0Ep1GqUIo+TRwgQvibvSeMcCic+B 7PAgh/GBq01FHRa298eszn+ylWv4MhGXuzLDqysqsdTV/hD9aTJP+QpAYVpuaOem rNYDWplsFFt3ekF5DGW0JCEgCmlyQ7o7WfWEh/CcSu9Mw19VGYloz/yhwx10gFTZ aNThvhS//akNhFyJRXsUkw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453u81un6x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:11 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523K3C97003202; Mon, 3 Mar 2025 21:10:10 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q4j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:10 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Ii022708; Mon, 3 Mar 2025 21:10:09 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-4; Mon, 03 Mar 2025 21:10:09 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 3/6] python: use qom-tree-get Date: Mon, 3 Mar 2025 13:09:59 -0800 Message-Id: <1741036202-265696-4-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-GUID: upKnyjoLk3AC-OqJM0Z77LQFq_fP2nui X-Proofpoint-ORIG-GUID: upKnyjoLk3AC-OqJM0Z77LQFq_fP2nui Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Use qom-tree-get to speed up the qom-tree command. Signed-off-by: Steve Sistare --- python/qemu/utils/qom.py | 36 ++++++++++++++--------------- python/qemu/utils/qom_common.py | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/python/qemu/utils/qom.py b/python/qemu/utils/qom.py index 426a0f2..086a592 100644 --- a/python/qemu/utils/qom.py +++ b/python/qemu/utils/qom.py @@ -35,6 +35,7 @@ from qemu.qmp import ExecuteError from .qom_common import QOMCommand +from .qom_common import ObjectNode try: @@ -224,28 +225,27 @@ def __init__(self, args: argparse.Namespace): super().__init__(args) self.path = args.path - def _list_node(self, path: str) -> None: + def _list_node(self, node: ObjectNode, path: str) -> None: print(path) - items = self.qom_list(path) - for item in items: - if item.child: - continue - try: - rsp = self.qmp.cmd('qom-get', path=path, - property=item.name) - print(f" {item.name}: {rsp} ({item.type})") - except ExecuteError as err: - print(f" {item.name}: ({item.type})") + + for item in node.properties: + value = item.value + if value == None: + value = f"" + print(f" {item.name}: {value} ({item.type})") + print('') - for item in items: - if not item.child: - continue - if path == '/': - path = '' - self._list_node(f"{path}/{item.name}") + if path == '/': + path = '' + + for child in node.children: + self._list_tree(child, f"{path}/{child.name}") + def run(self) -> int: - self._list_node(self.path) + root = self.qom_tree_get(self.path) + self._list_node(root, self.path) + return 0 diff --git a/python/qemu/utils/qom_common.py b/python/qemu/utils/qom_common.py index dd2c8b1..0303863 100644 --- a/python/qemu/utils/qom_common.py +++ b/python/qemu/utils/qom_common.py @@ -65,6 +65,49 @@ def link(self) -> bool: return self.type.startswith('link<') +class ObjectPropertyValue: + """ + Represents a property return from e.g. qom-tree-get + """ + def __init__(self, name: str, type_: str, value: object, error: str): + self.name = name + self.type = type_ + self.value = value + self.error = error + + @classmethod + def make(cls, value: Dict[str, Any]) -> 'ObjectPropertyValue': + """ + Build an ObjectPropertyValue from a Dict with an unknown shape. + """ + assert value.keys() >= {'name', 'type'} + assert value.keys() <= {'name', 'type', 'value', 'error'} + return cls(value['name'], value['type'], + value.get('value'), value.get('error')) + + +class ObjectNode: + """ + Represents the return type from e.g. qom-tree-get + """ + def __init__(self, name: str, children: List['ObjectNode'], + properties: List[ObjectPropertyValue]): + self.name = name + self.children = children + self.properties = properties + + @classmethod + def make(cls, value: Dict[str, Any]) -> 'ObjectNode': + """ + Build an ObjectNode from a Dict with an unknown shape. + """ + assert value.keys() == {'name', 'children', 'properties'} + + props = [ObjectPropertyValue.make(x) for x in value['properties']] + children = [ObjectNode.make(x) for x in value['children']] + return cls(value['name'], children, props) + + CommandT = TypeVar('CommandT', bound='QOMCommand') @@ -145,6 +188,13 @@ def qom_list(self, path: str) -> List[ObjectPropertyInfo]: assert isinstance(rsp, list) return [ObjectPropertyInfo.make(x) for x in rsp] + def qom_tree_get(self, path: str) -> ObjectNode: + """ + :return: a strongly typed root node from the 'qom-tree-get' command. + """ + rsp = self.qmp.cmd('qom-tree-get', path=path) + return ObjectNode.make(rsp) + @classmethod def command_runner( cls: Type[CommandT], From patchwork Mon Mar 3 21:10:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999511 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 lists.gnu.org (lists.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 F1D46C282C6 for ; Mon, 3 Mar 2025 21:11:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3N-0008V3-U1; Mon, 03 Mar 2025 16:10:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3K-0008Tq-5E for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:18 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3I-0008NJ-1t for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:17 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523JfiqP026461; Mon, 3 Mar 2025 21:10:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=H3l95ZER4KNR1p4p31JowLss+I5amTgeB3YcwYI1urA=; b= NcM11Qs+fkcjEkNRuN0eAdp9mgGzdJz23z+/BrIcF4uxG/8L5tBqWy5Cl/rVq8m3 7AJk4DU1v1ZsKCaUOMyMf43Wz1paf0i9LCTsRt117RrtCymk7sw9h8Aq0KYM8JuG OTOrPHb0zoZcDlX2Tg3sjopDz+eClxgxM+anZwScjT2DR9T1lp+vFSDgXeNxHvpU XiuOZHXtbj36SLx8W6mqBCcSnw8Mu+pBi3AD3QgF+O5bMHyMi4ICIXnXNcTwOoWo 0eWC+adyaha1CBhlvT9vzUK607BNBXAqtWl084UUGQavNHQDA+4N9MycarLGWSIJ I5gmin6hYyXlUzfZVvldEg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453ub73nex-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:13 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523KktjX003168; Mon, 3 Mar 2025 21:10:11 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q5m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:11 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Ik022708; Mon, 3 Mar 2025 21:10:11 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-5; Mon, 03 Mar 2025 21:10:11 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 4/6] tests/qtest/qom-test: unit test for qom-tree-get Date: Mon, 3 Mar 2025 13:10:00 -0800 Message-Id: <1741036202-265696-5-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-GUID: aq4J2j1rbssGx6qFLvSmk4pd1SFt8Y4d X-Proofpoint-ORIG-GUID: aq4J2j1rbssGx6qFLvSmk4pd1SFt8Y4d Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Add a unit test for qom-tree-get Signed-off-by: Steve Sistare --- tests/qtest/qom-test.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index 27d70bc..c567c4c 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -16,6 +16,55 @@ static int verbosity_level; +static void test_tree_node(QDict *node) +{ + QDict *prop, *child; + QList *props, *children; + QListEntry *entry; + + g_assert(qdict_haskey(node, "name")); + g_assert(qdict_haskey(node, "properties")); + + if (verbosity_level >= 3) { + g_test_message("%s", qdict_get_str(node, "name")); + } + + props = qobject_to(QList, qdict_get(node, "properties")); + QLIST_FOREACH_ENTRY(props, entry) { + prop = qobject_to(QDict, qlist_entry_obj(entry)); + g_assert(qdict_haskey(prop, "name")); + g_assert(qdict_haskey(prop, "type")); + g_assert(qdict_haskey(prop, "value") || qdict_haskey(prop, "error")); + } + + if (!qdict_haskey(node, "children")) { + return; + } + + children = qobject_to(QList, qdict_get(node, "children")); + QLIST_FOREACH_ENTRY(children, entry) { + child = qobject_to(QDict, qlist_entry_obj(entry)); + test_tree_node(child); + } +} + +static void test_tree(QTestState *qts, const char *path) +{ + g_autoptr(QDict) response = NULL; + QDict *node; + + if (verbosity_level >= 2) { + g_test_message("Obtaining tree at %s", path); + } + response = qtest_qmp(qts, "{ 'execute': 'qom-tree-get'," + " 'arguments': { 'path': %s } }", path); + g_assert(response); + + g_assert(qdict_haskey(response, "return")); + node = qobject_to(QDict, qdict_get(response, "return")); + test_tree_node(node); +} + static void test_properties(QTestState *qts, const char *path, bool recurse) { char *child_path; @@ -100,6 +149,7 @@ static void test_machine(gconstpointer data) } test_properties(qts, "/machine", true); + test_tree(qts, "/machine"); response = qtest_qmp(qts, "{ 'execute': 'quit' }"); g_assert(qdict_haskey(response, "return")); From patchwork Mon Mar 3 21:10:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999510 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 lists.gnu.org (lists.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 3C120C3DA4A for ; Mon, 3 Mar 2025 21:10:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3P-0008Vz-Nv; Mon, 03 Mar 2025 16:10:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3L-0008UD-3o for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:19 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3J-0008Nf-2x for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:18 -0500 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523JfkGW017866; Mon, 3 Mar 2025 21:10:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=ymG9MI8EghEaDX850prhJcUy2cuLgqR7OEveo/GRfb4=; b= n1Ct2seLIsiOj+n3ah/Rcv3RzaPqwq5iP0wQd83ae1VK9i0D7hsA2DjCGnLc4+TU SYmCVE7mXwLBHYZdk8Ke7hgZM4SFfo56dHZG80nLe1U7iaW0/pyEZ7IU/OmEgf30 vFbtOczulRdA90A3Fy3aBJtyKzE2tafdkuAvIN6IM7b2P//S3xFRAN1hKvWVc+a7 FWKok8ssrmPUBBFffnBfdZjrA9AbgmiPBir3f+LBS3tLNOgUG3I7YpLozffzpaj3 HRT1PxnBKDPAsGs3U9grtw2Ot/9WELjXQBwAc0e12wcibVtBf3KI9tEewIXKB8x1 YJyXX3wXP3VUyo5fo53qTA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453u9qbpcj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:14 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523KMPXY003159; Mon, 3 Mar 2025 21:10:13 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q6s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:12 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Im022708; Mon, 3 Mar 2025 21:10:12 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-6; Mon, 03 Mar 2025 21:10:12 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 5/6] qom: qom-list-getv Date: Mon, 3 Mar 2025 13:10:01 -0800 Message-Id: <1741036202-265696-6-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-ORIG-GUID: qeU7ZfyMylSbLpqwKeMB-ggO373VbWhu X-Proofpoint-GUID: qeU7ZfyMylSbLpqwKeMB-ggO373VbWhu Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Define the qom-list-getv command, which fetches all the properties and values for a list of paths. This is faster than qom-tree-get when fetching a subset of the QOM tree. See qom.json for details. Signed-off-by: Steve Sistare --- qapi/qom.json | 34 ++++++++++++++++++++++++++++++++++ qom/qom-qmp-cmds.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/qapi/qom.json b/qapi/qom.json index 646e3c6..c0c1839 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -65,6 +65,16 @@ '*error': 'str' } } ## +# @ObjectPropertiesValues: +# +# @properties: a list of properties. +# +# Since 10.0 +## +{ 'struct': 'ObjectPropertiesValues', + 'data': { 'properties': [ 'ObjectPropertyValue' ] }} + +## # @ObjectNode: # # @name: the name of the node @@ -161,6 +171,30 @@ 'allow-preconfig': true } ## +# @qom-list-getv: +# +# This command returns a list of properties and their values for +# each object path in the input list. +# +# @paths: The absolute or partial path for each object, as described +# in @qom-get +# +# Errors: +# - If any path is not valid or is ambiguous, returns an error. +# - If a property cannot be read, returns an error message in the +# corresponding @ObjectPropertyValue. +# +# Returns: A list of @ObjectPropertiesValues. Each element contains +# the properties of the corresponding element in @paths. +# +# Since 10.0 +## +{ 'command': 'qom-list-getv', + 'data': { 'paths': [ 'str' ] }, + 'returns': [ 'ObjectPropertiesValues' ], + 'allow-preconfig': true } + +## # @qom-tree-get: # # This command returns a tree of objects and their properties, diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 271f62d..b38f0d2 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -87,6 +87,46 @@ static void qom_list_add_property_value(Object *obj, ObjectProperty *prop, } } +static ObjectPropertyValueList *qom_get_property_value_list(const char *path, + Error **errp) +{ + Object *obj; + ObjectProperty *prop; + ObjectPropertyIterator iter; + ObjectPropertyValueList *props = NULL; + + obj = qom_resolve_path(path, errp); + if (obj == NULL) { + return NULL; + } + + object_property_iter_init(&iter, obj); + while ((prop = object_property_iter_next(&iter))) { + qom_list_add_property_value(obj, prop, &props); + } + + return props; +} + +ObjectPropertiesValuesList *qmp_qom_list_getv(strList *paths, Error **errp) +{ + ObjectPropertiesValuesList *head = NULL, **tail = &head; + + for ( ; paths ; paths = paths->next) { + ObjectPropertiesValues *item = g_new0(ObjectPropertiesValues, 1); + + QAPI_LIST_APPEND(tail, item); + + item->properties = qom_get_property_value_list(paths->value, errp); + if (!item->properties) { + qapi_free_ObjectPropertiesValuesList(head); + return NULL; + } + } + + return head; +} + static ObjectNode *qom_tree_get(const char *path, Error **errp) { Object *obj; From patchwork Mon Mar 3 21:10:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sistare X-Patchwork-Id: 13999513 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 lists.gnu.org (lists.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 E0B67C282C6 for ; Mon, 3 Mar 2025 21:11:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpD3m-00005y-7u; Mon, 03 Mar 2025 16:10:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3M-0008US-8g for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:20 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpD3K-0008OS-8I for qemu-devel@nongnu.org; Mon, 03 Mar 2025 16:10:19 -0500 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 523JfiVl017835; Mon, 3 Mar 2025 21:10:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :date:from:in-reply-to:message-id:references:subject:to; s= corp-2023-11-20; bh=lCl/RVSUzQscDRgqhE+KKOqL3OywA76LMCI7m93+tXU=; b= MYZ3APGCtgc3KeuJupK+L8K3W1pncxx+xu+qd6qD4I19ZqLWa8vBl11GMCTA9pHl 1gPz11Vnk1yp6Tcb/cieKCXj09iN2xxL6XmvK+WsmAcXrLTHOxNd1HYYyI7zS3FH W6stadZ5zjuwPQqcyqFcJFpvJLZsC+4dOO4dp0WUgFk+JLSDVAfy2DztPjqzy0hT JZKQLo53Ew6Zjzw1uMbfjdHo6wwg3V4AHhTRtPT3vEBvZPbQdKHIr3f6YXhjaGE7 8bw45u65QPS8e8N2RoONbvTrOLEg5mTDHE/WkVvPncwHu66+yA3RthHUlZuPsQgi FIrSXkUHjCTCv0ANF/ANMQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 453u9qbpcr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:15 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 523KktjZ003168; Mon, 3 Mar 2025 21:10:14 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 453rp82q7j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 03 Mar 2025 21:10:14 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 523LA4Io022708; Mon, 3 Mar 2025 21:10:13 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 453rp82pwh-7; Mon, 03 Mar 2025 21:10:13 +0000 From: Steve Sistare To: qemu-devel@nongnu.org Cc: John Snow , Cleber Rosa , Eric Blake , Markus Armbruster , Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , Fabiano Rosas , Laurent Vivier , Steve Sistare Subject: [PATCH V1 6/6] tests/qtest/qom-test: unit test for qom-list-getv Date: Mon, 3 Mar 2025 13:10:02 -0800 Message-Id: <1741036202-265696-7-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> References: <1741036202-265696-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-03_10,2025-03-03_04,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502100000 definitions=main-2503030163 X-Proofpoint-ORIG-GUID: 3EoZhvlMrtL697WWEnSFUH7BL4F4c8PT X-Proofpoint-GUID: 3EoZhvlMrtL697WWEnSFUH7BL4F4c8PT Received-SPF: pass client-ip=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 Add a unit test for qom-list-getv. Signed-off-by: Steve Sistare --- tests/qtest/qom-test.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index c567c4c..8785ea3 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -11,6 +11,7 @@ #include "qobject/qdict.h" #include "qobject/qlist.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" #include "libqtest.h" @@ -65,6 +66,68 @@ static void test_tree(QTestState *qts, const char *path) test_tree_node(node); } +static void test_getv(QTestState *qts, QList *paths) +{ + QListEntry *entry, *prop_entry, *path_entry; + g_autoptr(QDict) response = NULL; + QDict *args = qdict_new(); + QDict *prop; + QList *return_list; + + if (verbosity_level >= 2) { + g_test_message("Obtaining properties for paths:"); + QLIST_FOREACH_ENTRY(paths, path_entry) { + QString *qstr = qobject_to(QString, qlist_entry_obj(path_entry)); + g_test_message(" %s", qstring_get_str(qstr)); + } + } + + qdict_put_obj(args, "paths", QOBJECT(qlist_copy(paths))); + response = qtest_qmp(qts, "{ 'execute': 'qom-list-getv'," + " 'arguments': %p }", args); + g_assert(response); + g_assert(qdict_haskey(response, "return")); + return_list = qobject_to(QList, qdict_get(response, "return")); + + path_entry = QTAILQ_FIRST(&paths->head); + QLIST_FOREACH_ENTRY(return_list, entry) { + QDict *obj = qobject_to(QDict, qlist_entry_obj(entry)); + g_assert(qdict_haskey(obj, "properties")); + QList *properties = qobject_to(QList, qdict_get(obj, "properties")); + bool has_child = false; + + QLIST_FOREACH_ENTRY(properties, prop_entry) { + prop = qobject_to(QDict, qlist_entry_obj(prop_entry)); + g_assert(qdict_haskey(prop, "name")); + g_assert(qdict_haskey(prop, "type")); + g_assert(qdict_haskey(prop, "value") || + qdict_haskey(prop, "error")); + has_child |= strstart(qdict_get_str(prop, "type"), "child<", NULL); + } + + if (has_child) { + /* build a list of child paths */ + QString *qstr = qobject_to(QString, qlist_entry_obj(path_entry)); + const char *path = qstring_get_str(qstr); + g_autoptr(QList) child_paths = qlist_new(); + + QLIST_FOREACH_ENTRY(properties, prop_entry) { + prop = qobject_to(QDict, qlist_entry_obj(prop_entry)); + if (strstart(qdict_get_str(prop, "type"), "child<", NULL)) { + g_autofree char *child_path = g_strdup_printf( + "%s/%s", path, qdict_get_str(prop, "name")); + qlist_append_str(child_paths, child_path); + } + } + + /* fetch props for all children with one qom-list-getv call */ + test_getv(qts, child_paths); + } + + path_entry = QTAILQ_NEXT(path_entry, next); + } +} + static void test_properties(QTestState *qts, const char *path, bool recurse) { char *child_path; @@ -134,6 +197,7 @@ static void test_machine(gconstpointer data) const char *machine = data; QDict *response; QTestState *qts; + g_autoptr(QList) paths = qlist_new(); qts = qtest_initf("-machine %s", machine); @@ -150,6 +214,8 @@ static void test_machine(gconstpointer data) test_properties(qts, "/machine", true); test_tree(qts, "/machine"); + qlist_append_str(paths, "/machine"); + test_getv(qts, paths); response = qtest_qmp(qts, "{ 'execute': 'quit' }"); g_assert(qdict_haskey(response, "return"));