From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com
Subject: [PATCH 04/17] qom: Change object_property_get_uint16List() to match its doc
Date: Tue, 28 Apr 2020 18:34:06 +0200 [thread overview]
Message-ID: <20200428163419.4483-5-armbru@redhat.com> (raw)
In-Reply-To: <20200428163419.4483-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qom/object.h | 4 ++--
hw/core/machine-qmp-cmds.c | 6 +++---
qom/object.c | 9 +++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index ccfa82e33d..5d1ed672c3 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1331,8 +1331,8 @@ int object_property_get_enum(Object *obj, const char *name,
* undefined if an error occurs (including when the property value is not
* an list of integers).
*/
-void object_property_get_uint16List(Object *obj, const char *name,
- uint16List **list, Error **errp);
+uint16List *object_property_get_uint16List(Object *obj, const char *name,
+ Error **errp);
/**
* object_property_set:
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index eed5aeb2f7..f3a28035fc 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -325,9 +325,9 @@ static int query_memdev(Object *obj, void *opaque)
"policy",
"HostMemPolicy",
&error_abort);
- object_property_get_uint16List(obj, "host-nodes",
- &m->value->host_nodes,
- &error_abort);
+ m->value->host_nodes = object_property_get_uint16List(obj,
+ "host-nodes",
+ &error_abort);
m->next = *list;
*list = m;
diff --git a/qom/object.c b/qom/object.c
index 9c74749193..ddb021db21 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1559,10 +1559,11 @@ int object_property_get_enum(Object *obj, const char *name,
return ret;
}
-void object_property_get_uint16List(Object *obj, const char *name,
- uint16List **list, Error **errp)
+uint16List *object_property_get_uint16List(Object *obj, const char *name,
+ Error **errp)
{
Error *err = NULL;
+ uint16List *list = NULL;
Visitor *v;
char *str;
@@ -1575,11 +1576,11 @@ void object_property_get_uint16List(Object *obj, const char *name,
visit_complete(v, &str);
visit_free(v);
v = string_input_visitor_new(str);
- visit_type_uint16List(v, NULL, list, errp);
-
+ visit_type_uint16List(v, NULL, &list, errp);
g_free(str);
out:
visit_free(v);
+ return list;
}
void object_property_parse(Object *obj, const char *string,
--
2.21.1
next prev parent reply other threads:[~2020-04-28 16:40 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 16:34 [PATCH 00/17] qom: Spring cleaning Markus Armbruster
2020-04-28 16:34 ` [PATCH 01/17] qom: Clearer reference counting in object_initialize_childv() Markus Armbruster
2020-04-28 17:38 ` Eric Blake
2020-04-28 16:34 ` [PATCH 02/17] qom: Clean up inconsistent use of gchar * vs. char * Markus Armbruster
2020-04-28 17:41 ` Eric Blake
2020-05-02 5:06 ` Markus Armbruster
2020-05-04 9:32 ` Daniel P. Berrangé
2020-05-04 15:27 ` Markus Armbruster
2020-04-28 16:34 ` [PATCH 03/17] qom: Drop object_property_del_child()'s unused parameter @errp Markus Armbruster
2020-04-28 17:42 ` Eric Blake
2020-04-28 16:34 ` Markus Armbruster [this message]
2020-04-28 17:46 ` [PATCH 04/17] qom: Change object_property_get_uint16List() to match its doc Eric Blake
2020-05-02 5:06 ` Markus Armbruster
2020-04-28 16:34 ` [PATCH 05/17] qom: Make all the object_property_add_FOO() return the property Markus Armbruster
2020-04-28 17:51 ` Eric Blake
2020-04-28 16:34 ` [PATCH 06/17] qom: Drop object_property_set_description() parameter @errp Markus Armbruster
2020-04-28 18:00 ` Eric Blake
2020-04-28 16:34 ` [PATCH 07/17] tests/check-qom-proplist: Improve iterator coverage Markus Armbruster
2020-04-28 18:27 ` Eric Blake
2020-04-28 16:34 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-04-28 17:13 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 David Hildenbrand
2020-04-29 8:54 ` Christian Borntraeger
2020-04-30 18:47 ` Christian Borntraeger
2020-05-02 5:15 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-04 8:33 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 Christian Borntraeger
2020-04-30 18:22 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-01 9:06 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 David Hildenbrand
2020-05-02 6:26 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-02 8:39 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 David Hildenbrand
2020-05-05 14:23 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-05 14:46 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes,eaes}-256 David Hildenbrand
2020-05-05 15:23 ` [PATCH 08/17] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-04-28 16:34 ` [PATCH 09/17] hw/isa/superio: Make the components QOM children Markus Armbruster
2020-05-04 16:21 ` Philippe Mathieu-Daudé
2020-04-28 16:34 ` [PATCH 10/17] e1000: Don't run e1000_instance_init() twice Markus Armbruster
2020-04-29 8:55 ` Jason Wang
2020-04-28 16:34 ` [PATCH 11/17] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory Markus Armbruster
2020-04-28 17:27 ` Philippe Mathieu-Daudé
2020-04-28 16:34 ` [PATCH 12/17] qdev: Clean up qdev_connect_gpio_out_named() Markus Armbruster
2020-05-05 14:40 ` Philippe Mathieu-Daudé
2020-05-05 15:25 ` Markus Armbruster
2020-04-28 16:34 ` [PATCH 13/17] qom: Drop parameter @errp of object_property_add() & friends Markus Armbruster
2020-04-28 18:43 ` Eric Blake
2020-05-02 5:09 ` Markus Armbruster
2020-04-28 16:34 ` [PATCH 14/17] Drop more @errp parameters after previous commit Markus Armbruster
2020-04-28 18:44 ` Eric Blake
2020-04-28 16:34 ` [PATCH 15/17] qdev: Unrealize must not fail Markus Armbruster
2020-05-04 16:28 ` Philippe Mathieu-Daudé
2020-04-28 16:34 ` [PATCH 16/17] spapr_pci: Drop some dead error handling Markus Armbruster
2020-04-29 1:22 ` David Gibson
2020-04-29 7:03 ` Greg Kurz
2020-04-29 7:35 ` Philippe Mathieu-Daudé
2020-04-28 16:34 ` [PATCH 17/17] qom: Drop @errp parameter of object_property_del() Markus Armbruster
2020-04-28 18:50 ` Eric Blake
2020-05-02 5:09 ` Markus Armbruster
2020-04-28 23:24 ` [PATCH 00/17] qom: Spring cleaning no-reply
2020-05-04 12:48 ` Paolo Bonzini
2020-05-04 15:28 ` Markus Armbruster
2020-05-04 15:57 ` Paolo Bonzini
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=20200428163419.4483-5-armbru@redhat.com \
--to=armbru@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).