From nobody Sun May 19 12:13:27 2024 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 1520036897877873.8851337884214; Fri, 2 Mar 2018 16:28:17 -0800 (PST) Received: from localhost ([::1]:38041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erv1z-0001Jw-8b for importer@patchew.org; Fri, 02 Mar 2018 19:28:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eruzj-0008TX-7l for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eruzg-0005mT-2M for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:47 -0500 Received: from ozlabs.ru ([107.173.13.209]:43788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eruzf-0005lq-NN for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:43 -0500 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id C713C3A60038; Fri, 2 Mar 2018 19:25:26 -0500 (EST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Sat, 3 Mar 2018 11:25:03 +1100 Message-Id: <20180303002504.25142-2-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180303002504.25142-1-aik@ozlabs.ru> References: <20180303002504.25142-1-aik@ozlabs.ru> 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 v4 1/2] qmp: Merge ObjectPropertyInfo and DevicePropertyInfo 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 , Paolo Bonzini , Markus Armbruster , Andrea Bolognani 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" ObjectPropertyInfo is more generic and only missing @description. This adds a description to ObjectPropertyInfo and removes DevicePropertyInfo so the resulting ObjectPropertyInfo can be used elsewhere. Signed-off-by: Alexey Kardashevskiy --- Changes: v4: * added (since 2.12) to the new field * removed wrong reindents --- qapi-schema.json | 23 +++++------------------ qdev-monitor.c | 6 +++--- qmp.c | 14 +++++++------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 0262b9f..5cdf89a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1266,10 +1266,12 @@ # 3) A link type in the form 'link' where subtype is a qdev # device type name. Link properties form the device model graph. # +# @description: if specified, the description of the property (since 2.12). +# # Since: 1.2 ## { 'struct': 'ObjectPropertyInfo', - 'data': { 'name': 'str', 'type': 'str' } } + 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } =20 ## # @qom-list: @@ -1425,34 +1427,19 @@ 'returns': [ 'ObjectTypeInfo' ] } =20 ## -# @DevicePropertyInfo: -# -# Information about device properties. -# -# @name: the name of the property -# @type: the typename of the property -# @description: if specified, the description of the property. -# (since 2.2) -# -# Since: 1.2 -## -{ 'struct': 'DevicePropertyInfo', - 'data': { 'name': 'str', 'type': 'str', '*description': 'str' } } - -## # @device-list-properties: # # List properties associated with a device. # # @typename: the type name of a device # -# Returns: a list of DevicePropertyInfo describing a devices properties +# Returns: a list of ObjectPropertyInfo describing a devices properties # # Since: 1.2 ## { 'command': 'device-list-properties', 'data': { 'typename': 'str'}, - 'returns': [ 'DevicePropertyInfo' ] } + 'returns': [ 'ObjectPropertyInfo' ] } =20 ## # @xen-set-global-dirty-log: diff --git a/qdev-monitor.c b/qdev-monitor.c index 8462381..ab9c46c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -258,8 +258,8 @@ int qdev_device_help(QemuOpts *opts) { Error *local_err =3D NULL; const char *driver; - DevicePropertyInfoList *prop_list; - DevicePropertyInfoList *prop; + ObjectPropertyInfoList *prop_list; + ObjectPropertyInfoList *prop; =20 driver =3D qemu_opt_get(opts, "driver"); if (driver && is_help_option(driver)) { @@ -295,7 +295,7 @@ int qdev_device_help(QemuOpts *opts) } } =20 - qapi_free_DevicePropertyInfoList(prop_list); + qapi_free_ObjectPropertyInfoList(prop_list); return 1; =20 error: diff --git a/qmp.c b/qmp.c index 793f6f3..42b7862 100644 --- a/qmp.c +++ b/qmp.c @@ -456,19 +456,19 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_imple= ments, return ret; } =20 -/* Return a DevicePropertyInfo for a qdev property. +/* Return a ObjectPropertyInfo for a qdev property. * * If a qdev property with the given name does not exist, use the given de= fault * type. If the qdev property info should not be shown, return NULL. * * The caller must free the return value. */ -static DevicePropertyInfo *make_device_property_info(ObjectClass *klass, +static ObjectPropertyInfo *make_device_property_info(ObjectClass *klass, const char *name, const char *default_t= ype, const char *descripti= on) { - DevicePropertyInfo *info; + ObjectPropertyInfo *info; Property *prop; =20 do { @@ -508,14 +508,14 @@ static DevicePropertyInfo *make_device_property_info(= ObjectClass *klass, return info; } =20 -DevicePropertyInfoList *qmp_device_list_properties(const char *typename, +ObjectPropertyInfoList *qmp_device_list_properties(const char *typename, Error **errp) { ObjectClass *klass; Object *obj; ObjectProperty *prop; ObjectPropertyIterator iter; - DevicePropertyInfoList *prop_list =3D NULL; + ObjectPropertyInfoList *prop_list =3D NULL; =20 klass =3D object_class_by_name(typename); if (klass =3D=3D NULL) { @@ -540,8 +540,8 @@ DevicePropertyInfoList *qmp_device_list_properties(cons= t char *typename, =20 object_property_iter_init(&iter, obj); while ((prop =3D object_property_iter_next(&iter))) { - DevicePropertyInfo *info; - DevicePropertyInfoList *entry; + ObjectPropertyInfo *info; + ObjectPropertyInfoList *entry; =20 /* Skip Object and DeviceState properties */ if (strcmp(prop->name, "type") =3D=3D 0 || --=20 2.11.0 From nobody Sun May 19 12:13:27 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520036805248212.29444123645976; Fri, 2 Mar 2018 16:26:45 -0800 (PST) Received: from localhost ([::1]:38036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erv0e-0000OX-Gv for importer@patchew.org; Fri, 02 Mar 2018 19:26:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eruzE-0008Bd-TJ for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eruzD-0005FE-NN for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:16 -0500 Received: from ozlabs.ru ([107.173.13.209]:43580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eruzD-0005Ei-CM for qemu-devel@nongnu.org; Fri, 02 Mar 2018 19:25:15 -0500 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id AACC43A6004F; Fri, 2 Mar 2018 19:25:28 -0500 (EST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Sat, 3 Mar 2018 11:25:04 +1100 Message-Id: <20180303002504.25142-3-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180303002504.25142-1-aik@ozlabs.ru> References: <20180303002504.25142-1-aik@ozlabs.ru> 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 v4 2/2] 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 , Paolo Bonzini , Markus Armbruster , Andrea Bolognani 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: v3: * Used ObjectPropertyInfo instead of QOMPropertyInfo v2: * added abstract classes support, now things like "pci-device" or "spapr-machine" show properties, previously these would produce an "abstract class" error # Conflicts: # qapi-schema.json --- qapi-schema.json | 15 +++++++++++++++ include/qom/object.h | 16 ++++++++++++++++ qmp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ qom/object.c | 7 +++++++ 4 files changed, 87 insertions(+) diff --git a/qapi-schema.json b/qapi-schema.json index 5cdf89a..3021e90 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1442,6 +1442,21 @@ 'returns': [ 'ObjectPropertyInfo' ] } =20 ## +# @qom-list-properties: +# +# List properties associated with a QOM object. +# +# @typename: the type name of an object +# +# Returns: a list of ObjectPropertyInfo describing object properties +# +# Since: 2.12 +## +{ 'command': 'qom-list-properties', + 'data': { 'typename': 'str'}, + 'returns': [ 'ObjectPropertyInfo' ] } + +## # @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 42b7862..acd9048 100644 --- a/qmp.c +++ b/qmp.c @@ -576,6 +576,55 @@ ObjectPropertyInfoList *qmp_device_list_properties(con= st char *typename, return prop_list; } =20 +ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename, + Error **errp) +{ + ObjectClass *klass; + Object *obj =3D NULL; + ObjectProperty *prop; + ObjectPropertyIterator iter; + ObjectPropertyInfoList *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))) { + ObjectPropertyInfo *info; + ObjectPropertyInfoList *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