commit d20f616e8f8f8f8fdb04da850d9ce92880199db7
author Markus Armbruster <armbru@redhat.com> Thu Sep 17 14:55:39 2020 +0200
committer Eduardo Habkost <ehabkost@redhat.com> Fri Sep 18 13:49:48 2020 -0400
tree 8be4116314f1fb807573c36b1c8eec2eb9d58b62
parent 04dcf4b5db98db8023f895e1f557baf45b34735d

qom: Clean up object_property_get_enum()'s error value

object_property_get_enum() is the only object_property_FOO() that is
documented to return an undefined value on error.  It does no such
thing, actually: it returns 0 on some errors, and -1 on others.

Needlessly complicated.  Always return -1 on error, and adjust the
contract.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200917125540.597786-2-armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

qom/object.c

diff --git a/qom/object.c b/qom/object.c
index 387efb2..cecad35 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1564,21 +1564,21 @@
     EnumProperty *enumprop;
 
     if (prop == NULL) {
-        return 0;
+        return -1;
     }
 
     if (!g_str_equal(prop->type, typename)) {
         error_setg(errp, "Property %s on %s is not '%s' enum type",
                    name, object_class_get_name(
                        object_get_class(obj)), typename);
-        return 0;
+        return -1;
     }
 
     enumprop = prop->opaque;
 
     str = object_property_get_str(obj, name, errp);
     if (!str) {
-        return 0;
+        return -1;
     }
 
     ret = qapi_enum_parse(enumprop->lookup, str, -1, errp);