From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH 23/26] qom: simplify qmp_device_list_properties()
Date: Sun, 1 Dec 2019 15:15:28 +0400 [thread overview]
Message-ID: <20191201111531.1136947-24-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20191201111531.1136947-1-marcandre.lureau@redhat.com>
All qdev properties are object properties, no need for
make_device_property_info() helper.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qom/qom-qmp-cmds.c | 52 +++++-----------------------------------------
1 file changed, 5 insertions(+), 47 deletions(-)
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index f4494f98ac..8785816c1f 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -121,48 +121,6 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements,
return ret;
}
-/* Return a DevicePropertyInfo for a qdev property.
- *
- * If a qdev property with the given name does not exist, use the given default
- * type. If the qdev property info should not be shown, return NULL.
- *
- * The caller must free the return value.
- */
-static ObjectPropertyInfo *make_device_property_info(ObjectClass *klass,
- const char *name,
- const char *default_type,
- const char *description)
-{
- ObjectPropertyInfo *info;
- Property *prop;
-
- do {
- for (prop = DEVICE_CLASS(klass)->props; prop && prop->name; prop++) {
- if (strcmp(name, prop->name) != 0) {
- continue;
- }
-
- info = g_malloc0(sizeof(*info));
- info->name = g_strdup(prop->name);
- info->type = default_type ? g_strdup(default_type)
- : g_strdup(prop->info->name);
- info->has_description = !!prop->info->description;
- info->description = g_strdup(prop->info->description);
- return info;
- }
- klass = object_class_get_parent(klass);
- } while (klass != object_class_by_name(TYPE_DEVICE));
-
- /* Not a qdev property, use the default type */
- info = g_malloc0(sizeof(*info));
- info->name = g_strdup(name);
- info->type = g_strdup(default_type);
- info->has_description = !!description;
- info->description = g_strdup(description);
-
- return info;
-}
-
ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
Error **errp)
{
@@ -214,11 +172,11 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
continue;
}
- info = make_device_property_info(klass, prop->name, prop->type,
- prop->description);
- if (!info) {
- continue;
- }
+ info = g_new0(ObjectPropertyInfo, 1);
+ info->name = g_strdup(prop->name);
+ info->type = g_strdup(prop->type);
+ info->has_description = !!prop->description;
+ info->description = g_strdup(prop->description);
entry = g_malloc0(sizeof(*entry));
entry->value = info;
--
2.24.0
next prev parent reply other threads:[~2019-12-01 11:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-01 11:15 [PATCH 00/26] Make QDev use class properties Marc-André Lureau
2019-12-01 11:15 ` [PATCH 01/26] object: add extra sanity checks Marc-André Lureau
2019-12-01 19:33 ` Philippe Mathieu-Daudé
2019-12-01 11:15 ` [PATCH 02/26] qdev: remove duplicated qdev_property_add_static() doc Marc-André Lureau
2019-12-11 15:42 ` Damien Hedde
2019-12-01 11:15 ` [PATCH 03/26] qdev: remove extraneous error Marc-André Lureau
2019-12-11 16:53 ` Damien Hedde
2019-12-01 11:15 ` [PATCH 04/26] qdev: move helper function to monitor/misc Marc-André Lureau
2019-12-01 19:35 ` Philippe Mathieu-Daudé
2019-12-01 11:15 ` [PATCH 05/26] object: avoid extra class property key duplication Marc-André Lureau
2019-12-01 11:15 ` [PATCH 06/26] object: add class property initializer Marc-André Lureau
2019-12-01 11:15 ` [PATCH 07/26] object: add object_property_get_defaut() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 08/26] object: make object_class_property_add* return property Marc-André Lureau
2019-12-01 11:15 ` [PATCH 09/26] qstring: add qstring_free() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 10/26] object: add object_property_set_defaut_{bool, str, int, uint}() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 11/26] object: do not free class properties Marc-André Lureau
2019-12-01 11:15 ` [PATCH 12/26] object: check strong flag with & Marc-André Lureau
2019-12-01 11:15 ` [PATCH 13/26] object: rename link "child" to "target" Marc-André Lureau
2019-12-01 11:15 ` [PATCH 14/26] object: add direct link flag Marc-André Lureau
2019-12-01 11:15 ` [PATCH 15/26] object: express const link with link property Marc-André Lureau
2019-12-01 11:15 ` [PATCH 16/26] object: add object_class_property_add_link() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 17/26] object: release all props Marc-André Lureau
2019-12-01 11:15 ` [PATCH 18/26] object: return self in object_ref() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 19/26] qdev: set properties with device_class_set_props() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 20/26] qdev: move instance properties to class properties Marc-André Lureau
2019-12-01 11:15 ` [PATCH 21/26] qdev: register properties as " Marc-André Lureau
2019-12-01 11:15 ` [PATCH 22/26] vl: print default value in object help Marc-André Lureau
2019-12-01 11:15 ` Marc-André Lureau [this message]
2019-12-01 11:15 ` [PATCH 24/26] qom: introduce object_property_help() Marc-André Lureau
2019-12-01 11:15 ` [PATCH 25/26] qapi/qmp: add ObjectPropertyInfo.default-value Marc-André Lureau
2019-12-11 16:06 ` Eric Blake
2019-12-11 17:41 ` Marc-André Lureau
2019-12-01 11:15 ` [PATCH 26/26] qdev: use object_property_help() Marc-André Lureau
2020-01-10 15:30 [PATCH 00/26] Various qom & qdev enhancements Marc-André Lureau
2020-01-10 15:30 ` [PATCH 23/26] qom: simplify qmp_device_list_properties() Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191201111531.1136947-24-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).