From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Pavel Fedin" <p.fedin@samsung.com>, "Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PATCH v3 3/5] vl: convert machine help to use object_property_foreach
Date: Thu, 8 Oct 2015 15:09:02 +0100 [thread overview]
Message-ID: <1444313344-16196-4-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1444313344-16196-1-git-send-email-berrange@redhat.com>
Rather than directly traversing the object property list,
use the object_property_foreach iterator. This removes a
dependancy on the implementation approach for properties.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
vl.c | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/vl.c b/vl.c
index f2bd8d2..a29fb82 100644
--- a/vl.c
+++ b/vl.c
@@ -1511,27 +1511,34 @@ MachineInfoList *qmp_query_machines(Error **errp)
return mach_list;
}
-static int machine_help_func(QemuOpts *opts, MachineState *machine)
+
+static void machine_help_func_iter(Object *obj,
+ ObjectProperty *prop,
+ Error **errp,
+ void *opaque)
{
- ObjectProperty *prop;
+ MachineState *machine = MACHINE(obj);
+ if (!prop->set) {
+ return;
+ }
+
+ error_printf("%s.%s=%s", MACHINE_GET_CLASS(machine)->name,
+ prop->name, prop->type);
+ if (prop->description) {
+ error_printf(" (%s)\n", prop->description);
+ } else {
+ error_printf("\n");
+ }
+}
+static int machine_help_func(QemuOpts *opts, MachineState *machine)
+{
if (!qemu_opt_has_help_opt(opts)) {
return 0;
}
- QTAILQ_FOREACH(prop, &OBJECT(machine)->properties, node) {
- if (!prop->set) {
- continue;
- }
-
- error_printf("%s.%s=%s", MACHINE_GET_CLASS(machine)->name,
- prop->name, prop->type);
- if (prop->description) {
- error_printf(" (%s)\n", prop->description);
- } else {
- error_printf("\n");
- }
- }
+ object_property_foreach(OBJECT(machine),
+ machine_help_func_iter, NULL, NULL);
return 1;
}
--
2.4.3
next prev parent reply other threads:[~2015-10-08 14:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 14:08 [Qemu-devel] [PATCH v3 0/5] qom: more efficient object property handling Daniel P. Berrange
2015-10-08 14:09 ` [Qemu-devel] [PATCH v3 1/5] qom: introduce object_property_foreach method Daniel P. Berrange
2015-10-08 16:29 ` Eric Blake
2015-10-09 8:31 ` [Qemu-devel] Stick to loops (was: [PATCH v3 1/5] qom: introduce object_property_foreach method) Markus Armbruster
2015-10-12 10:00 ` Daniel P. Berrange
2015-10-12 10:24 ` [Qemu-devel] Stick to loops Paolo Bonzini
2015-10-12 11:56 ` Markus Armbruster
2015-10-13 12:09 ` [Qemu-devel] Stick to loops (was: [PATCH v3 1/5] qom: introduce object_property_foreach method) Daniel P. Berrange
2015-10-08 14:09 ` [Qemu-devel] [PATCH v3 2/5] qmp: convert to use object_property_foreach iterators Daniel P. Berrange
2015-10-08 16:35 ` Eric Blake
2015-10-08 14:09 ` Daniel P. Berrange [this message]
2015-10-08 19:06 ` [Qemu-devel] [PATCH v3 3/5] vl: convert machine help to use object_property_foreach Eric Blake
2015-10-08 14:09 ` [Qemu-devel] [PATCH v3 4/5] qom: replace object property list with GHashTable Daniel P. Berrange
2015-10-08 15:05 ` Pavel Fedin
2015-10-08 19:13 ` Eric Blake
2015-10-08 14:09 ` [Qemu-devel] [PATCH v3 5/5] qom: allow properties to be registered against classes Daniel P. Berrange
2015-10-08 19:35 ` Eric Blake
2015-10-08 15:12 ` [Qemu-devel] [PATCH v3 0/5] qom: more efficient object property handling Eric Blake
2015-10-08 15:27 ` Pavel Fedin
2015-10-08 15:48 ` Daniel P. Berrange
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=1444313344-16196-4-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=afaerber@suse.de \
--cc=p.fedin@samsung.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).