qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com
Subject: [PULL 04/21] qom: Simplify object_property_get_enum()
Date: Fri, 15 May 2020 08:04:07 +0200	[thread overview]
Message-ID: <20200515060424.18993-5-armbru@redhat.com> (raw)
In-Reply-To: <20200515060424.18993-1-armbru@redhat.com>

Reuse object_property_get_str().  Switches from the string to the
qobject visitor under the hood.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200505152926.18877-5-armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qom/object.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/qom/object.c b/qom/object.c
index 3d65658059..b374af302c 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1521,8 +1521,6 @@ typedef struct EnumProperty {
 int object_property_get_enum(Object *obj, const char *name,
                              const char *typename, Error **errp)
 {
-    Error *err = NULL;
-    Visitor *v;
     char *str;
     int ret;
     ObjectProperty *prop = object_property_find(obj, name, errp);
@@ -1541,15 +1539,10 @@ int object_property_get_enum(Object *obj, const char *name,
 
     enumprop = prop->opaque;
 
-    v = string_output_visitor_new(false, &str);
-    object_property_get(obj, v, name, &err);
-    if (err) {
-        error_propagate(errp, err);
-        visit_free(v);
+    str = object_property_get_str(obj, name, errp);
+    if (!str) {
         return 0;
     }
-    visit_complete(v, &str);
-    visit_free(v);
 
     ret = qapi_enum_parse(enumprop->lookup, str, -1, errp);
     g_free(str);
-- 
2.21.1



  parent reply	other threads:[~2020-05-15  6:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15  6:04 [PULL 00/21] QOM patches for 2020-05-15 Markus Armbruster
2020-05-15  6:04 ` [PULL 01/21] qom: Clearer reference counting in object_initialize_childv() Markus Armbruster
2020-05-15  6:04 ` [PULL 02/21] qom: Clean up inconsistent use of gchar * vs. char * Markus Armbruster
2020-05-15  6:04 ` [PULL 03/21] qom: Drop object_property_del_child()'s unused parameter @errp Markus Armbruster
2020-05-15  6:04 ` Markus Armbruster [this message]
2020-05-15  6:04 ` [PULL 05/21] qom: Drop convenience method object_property_get_uint16List() Markus Armbruster
2020-05-15  6:04 ` [PULL 06/21] qom: Make all the object_property_add_FOO() return the property Markus Armbruster
2020-05-15  6:04 ` [PULL 07/21] qom: Drop object_property_set_description() parameter @errp Markus Armbruster
2020-05-15  6:04 ` [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage Markus Armbruster
2020-05-15  6:04 ` [PULL 09/21] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256 Markus Armbruster
2020-05-15  6:04 ` [PULL 10/21] hw/isa/superio: Make the components QOM children Markus Armbruster
2020-05-15  6:04 ` [PULL 11/21] e1000: Don't run e1000_instance_init() twice Markus Armbruster
2020-05-15  6:04 ` [PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory Markus Armbruster
2020-05-15  6:04 ` [PULL 13/21] qdev: Clean up qdev_connect_gpio_out_named() Markus Armbruster
2020-05-15  6:04 ` [PULL 14/21] qom: Drop parameter @errp of object_property_add() & friends Markus Armbruster
2020-05-15  6:04 ` [PULL 15/21] Drop more @errp parameters after previous commit Markus Armbruster
2020-05-15  6:04 ` [PULL 16/21] qdev: Unrealize must not fail Markus Armbruster
2020-05-15  6:04 ` [PULL 17/21] spapr_pci: Drop some dead error handling Markus Armbruster
2020-05-15  6:04 ` [PULL 18/21] qom: Drop @errp parameter of object_property_del() Markus Armbruster
2020-05-15  6:04 ` [PULL 19/21] target: Remove unnecessary CPU() cast Markus Armbruster
2020-05-15  6:04 ` [PULL 20/21] various: Remove unnecessary OBJECT() cast Markus Armbruster
2020-05-15  6:04 ` [PULL 21/21] hw: Remove unnecessary DEVICE() cast Markus Armbruster
2020-05-15  7:17 ` [PULL 00/21] QOM patches for 2020-05-15 no-reply
2020-05-15  8:54 ` no-reply
2020-05-15 10:17 ` Peter Maydell
2020-05-15 14:34 ` no-reply

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=20200515060424.18993-5-armbru@redhat.com \
    --to=armbru@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).