From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erbxJ-0004EJ-NO for qemu-devel@nongnu.org; Thu, 01 Mar 2018 23:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erbxF-0007NL-SJ for qemu-devel@nongnu.org; Thu, 01 Mar 2018 23:06:01 -0500 Received: from ozlabs.org ([103.22.144.67]:47033) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erbxF-0007GC-5M for qemu-devel@nongnu.org; Thu, 01 Mar 2018 23:05:57 -0500 Date: Fri, 2 Mar 2018 13:05:45 +1100 From: David Gibson Message-ID: <20180302020545.GE13135@umbus.fritz.box> References: <20180301130939.15875-1-aik@ozlabs.ru> <20180301130939.15875-3-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="DqhR8hV3EnoxUkKN" Content-Disposition: inline In-Reply-To: <20180301130939.15875-3-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH qemu v3 2/2] qmp: Add qom-list-properties to list QOM object properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-devel@nongnu.org, Paolo Bonzini , Eric Blake , Markus Armbruster , Andrea Bolognani --DqhR8hV3EnoxUkKN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 02, 2018 at 12:09:39AM +1100, Alexey Kardashevskiy wrote: > 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. >=20 > 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. >=20 > 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. >=20 > 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. >=20 > Signed-off-by: Alexey Kardashevskiy > --- > Changes: > v3: > * Used ObjectPropertyInfo instead of QOMPropertyInfo >=20 > v2: > * added abstract classes support, now things like "pci-device" or > "spapr-machine" show properties, previously these would produce > an "abstract class" error >=20 > # 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(+) >=20 > diff --git a/qapi-schema.json b/qapi-schema.json > index 87327e5..32e836f 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(ObjectPropertyItera= tor *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 8a74038..1f15f68 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -576,6 +576,55 @@ ObjectPropertyInfoList *qmp_device_list_properties(c= onst 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_= OBJECT); > + return NULL; > + } > + > + if (object_class_is_abstract(klass)) { > + object_class_property_iter_init(&iter, klass); I remain a bit concerned about the subtle difference in behaviour between abstract and non-abstract classes. > + } 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(ObjectPr= opertyIterator *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 cha= r *name, > Error **errp) > { --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --DqhR8hV3EnoxUkKN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlqYsXcACgkQbDjKyiDZ s5LrJBAAuAyPpddDvzq9nhjZxjgDq1wGUSIRoOOX4gkpRiamUSh7176BJz/xqpPp pWDn4ZterZuA8600nfkxBmmU5UaJRTi/TzB0oR3mV4EONZIrFtFhiQGOoDA7kS6n Q+eMcTBJUYwY7Ard7nFQHbDhEWzWe1kWHtRg9lG2M3a+TW1sL7/QdBKz5n+5kI2J O+XlJ/E6QkvcedkuuA9SwokdxnRF/1wkAFBUwlGx+oRp49fCzHp77gJLpdxx17E5 5GaKMC1Pr2GOslNvx53AOPlDPuXuXZwwCttovZIEcNucZT9TXbMx20WURWCfvHxt MNt24BC1PiLPY/Dd6XDlQrtQ7LbyTqOF+7wlF/HSHzUKHcZbdgn3fEuSLPuxyQwO ceIBJOmC0+/RflAVL7i3RxNSXMVWjE4Eex+dhrl2G/ppa6QovBZEf6YrwzrUeTvO BKpe5N2T65mn+5hueEIe/r41hNc4yfx92Bppf7FLbzwqDQkIXXjQ7IxzcCs+4oen NGZyQ+vI1BjkkYv/421QH178Qe5GxYouFDBHoSN/v1EPp6YPVA1lymCg5CbXgHEU kDx+lbpRwEOiyhJL8AOESLyTjwhmp/OqpLQqw0hMV2aHL8JcAkRQpOuunmvh3DeU fot+ir2wRomSOLHXEdMtQ5riin+JVd0x5SCRoS559uCoRLl2N7E= =uLvi -----END PGP SIGNATURE----- --DqhR8hV3EnoxUkKN--