From nobody Wed Oct 22 04:17:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519633504066465.9991715042356; Mon, 26 Feb 2018 00:25:04 -0800 (PST) Received: from localhost ([::1]:57683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqE5c-00071m-VF for importer@patchew.org; Mon, 26 Feb 2018 03:24:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqE4S-0006c8-7C for qemu-devel@nongnu.org; Mon, 26 Feb 2018 03:23:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqE4O-0006VD-6z for qemu-devel@nongnu.org; Mon, 26 Feb 2018 03:23:40 -0500 Received: from ozlabs.ru ([107.173.13.209]:57546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqE4N-0006Tw-TN for qemu-devel@nongnu.org; Mon, 26 Feb 2018 03:23:36 -0500 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 8F3B13A60007; Mon, 26 Feb 2018 03:23:14 -0500 (EST) From: Alexey Kardashevskiy To: Paolo Bonzini Date: Mon, 26 Feb 2018 19:22:59 +1100 Message-Id: <20180226082259.40293-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 107.173.13.209 Subject: [Qemu-devel] [PATCH qemu v2] qmp: Add qom-list-properties to list QOM object properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy , Markus Armbruster , qemu-devel@nongnu.org, Andrea Bolognani , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There is already 'device-list-properties' which does most of the job, however it does not handle everything returned by qom-list-types such as machines as they inherit directly from TYPE_OBJECT and not TYPE_DEVICE. It does not handle abstract classes either. This adds a new qom-list-properties command which prints properties of a specific class and its instance. It is pretty much a simplified copy of the device-list-properties handler. Since it creates an object instance, device properties should appear in the output as they are copied to QOM properties at the instance_init hook. This adds a object_class_property_iter_init() helper to allow class properties enumeration uses it in the new QMP command to allow properties listing for abstract classes. Signed-off-by: Alexey Kardashevskiy --- Changes: v2: * added abstract classes support, now things like "pci-device" or "spapr-machine" show properties, previously these would produce an "abstract class" error --- qapi-schema.json | 29 +++++++++++++++++++++++++++++ include/qom/object.h | 16 ++++++++++++++++ qmp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ qom/object.c | 7 +++++++ 4 files changed, 101 insertions(+) diff --git a/qapi-schema.json b/qapi-schema.json index 0262b9f..fa5f189 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1455,6 +1455,35 @@ 'returns': [ 'DevicePropertyInfo' ] } =20 ## +# @QOMPropertyInfo: +# +# Information about object properties. +# +# @name: the name of the property +# @type: the typename of the property +# @description: if specified, the description of the property. +# +# Since: 2.12 +## +{ 'struct': 'QOMPropertyInfo', + 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } + +## +# @qom-list-properties: +# +# List properties associated with a QOM object. +# +# @typename: the type name of an object +# +# Returns: a list of QOMPropertyInfo describing object properties +# +# Since: 2.12 +## +{ 'command': 'qom-list-properties', + 'data': { 'typename': 'str'}, + 'returns': [ 'QOMPropertyInfo' ] } + +## # @xen-set-global-dirty-log: # # Enable or disable the global dirty log mode. diff --git a/include/qom/object.h b/include/qom/object.h index dc73d59..ef07d78 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1017,6 +1017,22 @@ void object_property_iter_init(ObjectPropertyIterato= r *iter, Object *obj); =20 /** + * object_class_property_iter_init: + * @klass: the class + * + * Initializes an iterator for traversing all properties + * registered against an object class and all parent classes. + * + * It is forbidden to modify the property list while iterating, + * whether removing or adding properties. + * + * This can be used on abstract classes as it does not create a temporary + * instance. + */ +void object_class_property_iter_init(ObjectPropertyIterator *iter, + ObjectClass *klass); + +/** * object_property_iter_next: * @iter: the iterator instance * diff --git a/qmp.c b/qmp.c index 793f6f3..151d3d7 100644 --- a/qmp.c +++ b/qmp.c @@ -576,6 +576,55 @@ DevicePropertyInfoList *qmp_device_list_properties(con= st char *typename, return prop_list; } =20 +QOMPropertyInfoList *qmp_qom_list_properties(const char *typename, + Error **errp) +{ + ObjectClass *klass; + Object *obj =3D NULL; + ObjectProperty *prop; + ObjectPropertyIterator iter; + QOMPropertyInfoList *prop_list =3D NULL; + + klass =3D object_class_by_name(typename); + if (klass =3D=3D NULL) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, + "Class '%s' not found", typename); + return NULL; + } + + klass =3D object_class_dynamic_cast(klass, TYPE_OBJECT); + if (klass =3D=3D NULL) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_OB= JECT); + return NULL; + } + + if (object_class_is_abstract(klass)) { + object_class_property_iter_init(&iter, klass); + } else { + obj =3D object_new(typename); + object_property_iter_init(&iter, obj); + } + while ((prop =3D object_property_iter_next(&iter))) { + QOMPropertyInfo *info; + QOMPropertyInfoList *entry; + + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(prop->name); + info->type =3D g_strdup(prop->type); + info->has_description =3D !!prop->description; + info->description =3D g_strdup(prop->description); + + entry =3D g_malloc0(sizeof(*entry)); + entry->value =3D info; + entry->next =3D prop_list; + prop_list =3D entry; + } + + object_unref(obj); + + return prop_list; +} + CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) { return arch_query_cpu_definitions(errp); diff --git a/qom/object.c b/qom/object.c index 5dcee46..e7978bd 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1037,6 +1037,13 @@ ObjectProperty *object_property_iter_next(ObjectProp= ertyIterator *iter) return val; } =20 +void object_class_property_iter_init(ObjectPropertyIterator *iter, + ObjectClass *klass) +{ + g_hash_table_iter_init(&iter->iter, klass->properties); + iter->nextclass =3D klass; +} + ObjectProperty *object_class_property_find(ObjectClass *klass, const char = *name, Error **errp) { --=20 2.11.0