[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 04/18] qom: Simplify object_property_get_enum()
From: |
Paolo Bonzini |
Subject: |
Re: [PATCH v2 04/18] qom: Simplify object_property_get_enum() |
Date: |
Tue, 5 May 2020 18:36:14 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 |
On 05/05/20 17:29, Markus Armbruster wrote:
> Reuse object_property_get_str(). Switches from the string to the
> qobject visitor under the hood.
>
> Signed-off-by: Markus Armbruster <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);
>
Reviewed-by: Paolo Bonzini <address@hidden>
- [PATCH v2 00/18] qom: Spring cleaning, Markus Armbruster, 2020/05/05
- [PATCH v2 01/18] qom: Clearer reference counting in object_initialize_childv(), Markus Armbruster, 2020/05/05
- [PATCH v2 04/18] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/05/05
- [PATCH v2 11/18] e1000: Don't run e1000_instance_init() twice, Markus Armbruster, 2020/05/05
- [PATCH v2 05/18] qom: Drop convenience method object_property_get_uint16List(), Markus Armbruster, 2020/05/05
- [PATCH v2 02/18] qom: Clean up inconsistent use of gchar * vs. char *, Markus Armbruster, 2020/05/05
- [PATCH v2 13/18] qdev: Clean up qdev_connect_gpio_out_named(), Markus Armbruster, 2020/05/05
- [PATCH v2 06/18] qom: Make all the object_property_add_FOO() return the property, Markus Armbruster, 2020/05/05
- [PATCH v2 08/18] tests/check-qom-proplist: Improve iterator coverage, Markus Armbruster, 2020/05/05
- [PATCH v2 15/18] Drop more @errp parameters after previous commit, Markus Armbruster, 2020/05/05
- [PATCH v2 18/18] qom: Drop @errp parameter of object_property_del(), Markus Armbruster, 2020/05/05