[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/21] qom: Simplify object_property_get_enum()
From: |
Markus Armbruster |
Subject: |
[PULL 04/21] qom: Simplify object_property_get_enum() |
Date: |
Fri, 15 May 2020 08:04:07 +0200 |
Reuse object_property_get_str(). Switches from the string to the
qobject visitor under the hood.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
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
- [PULL 13/21] qdev: Clean up qdev_connect_gpio_out_named(), (continued)
- [PULL 13/21] qdev: Clean up qdev_connect_gpio_out_named(), Markus Armbruster, 2020/05/15
- [PULL 08/21] tests/check-qom-proplist: Improve iterator coverage, Markus Armbruster, 2020/05/15
- [PULL 07/21] qom: Drop object_property_set_description() parameter @errp, Markus Armbruster, 2020/05/15
- [PULL 17/21] spapr_pci: Drop some dead error handling, Markus Armbruster, 2020/05/15
- [PULL 10/21] hw/isa/superio: Make the components QOM children, Markus Armbruster, 2020/05/15
- [PULL 09/21] s390x/cpumodel: Fix UI to CPU features pcc-cmac-{aes, eaes}-256, Markus Armbruster, 2020/05/15
- [PULL 06/21] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/05/15
- [PULL 15/21] Drop more @errp parameters after previous commit, Markus Armbruster, 2020/05/15
- [PULL 19/21] target: Remove unnecessary CPU() cast, Markus Armbruster, 2020/05/15
- [PULL 16/21] qdev: Unrealize must not fail, Markus Armbruster, 2020/05/15
- [PULL 04/21] qom: Simplify object_property_get_enum(),
Markus Armbruster <=
- [PULL 11/21] e1000: Don't run e1000_instance_init() twice, Markus Armbruster, 2020/05/15
- [PULL 20/21] various: Remove unnecessary OBJECT() cast, Markus Armbruster, 2020/05/15
- [PULL 21/21] hw: Remove unnecessary DEVICE() cast, Markus Armbruster, 2020/05/15
- [PULL 14/21] qom: Drop parameter @errp of object_property_add() & friends, Markus Armbruster, 2020/05/15
- [PULL 12/21] hw/arm/bcm2835: Drop futile attempts at QOM-adopting memory, Markus Armbruster, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, Peter Maydell, 2020/05/15
- Re: [PULL 00/21] QOM patches for 2020-05-15, no-reply, 2020/05/15