motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qom: Clean up object_property_get_enum()'s error value

Browse source 
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>
This commit is contained in:
Markus Armbruster 2020-09-17 14:55:39 +02:00 • committed by Eduardo Habkost
parent 04dcf4b5db
commit d20f616e8f
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qom/object.c
View file

@ -1564,21 +1564,21 @@ int object_property_get_enum(Object *obj, const char *name,
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);