diff options
| author | Markus Armbruster | 2020-05-05 17:29:15 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-05-15 07:06:49 +0200 |
| commit | 7eecec7d1224890b0d04479dd4736e1eefaa72dc (patch) | |
| tree | 58da9dda7cf32c9297f6d710d6dac2f0bf493448 /include/qom | |
| parent | qom: Make all the object_property_add_FOO() return the property (diff) | |
| download | qemu-7eecec7d1224890b0d04479dd4736e1eefaa72dc.tar.gz qemu-7eecec7d1224890b0d04479dd4736e1eefaa72dc.tar.xz qemu-7eecec7d1224890b0d04479dd4736e1eefaa72dc.zip | |
qom: Drop object_property_set_description() parameter @errp
object_property_set_description() and
object_class_property_set_description() fail only when property @name
is not found.
There are 85 calls of object_property_set_description() and
object_class_property_set_description(). None of them can fail:
* 84 immediately follow the creation of the property.
* The one in spapr_rng_instance_init() refers to a property created in
spapr_rng_class_init(), from spapr_rng_properties[].
Every one of them still gets to decide what to pass for @errp.
51 calls pass &error_abort, 32 calls pass NULL, one receives the error
and propagates it to &error_abort, and one propagates it to
&error_fatal. I'm actually surprised none of them violates the Error
API.
What are we gaining by letting callers handle the "property not found"
error? Use when the property is not known to exist is simpler: you
don't have to guard the call with a check. We haven't found such a
use in 5+ years. Until we do, let's make life a bit simpler and drop
the @errp parameter.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-8-armbru@redhat.com>
[One semantic rebase conflict resolved]
Diffstat (limited to 'include/qom')
| -rw-r--r-- | include/qom/object.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/qom/object.h b/include/qom/object.h index 0ea5808432..1f0386a231 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1813,16 +1813,14 @@ ObjectProperty *object_property_add_const_link(Object *obj, const char *name, * @obj: the object owning the property * @name: the name of the property * @description: the description of the property on the object - * @errp: if an error occurs, a pointer to an area to store the error * * Set an object property's description. * */ void object_property_set_description(Object *obj, const char *name, - const char *description, Error **errp); + const char *description); void object_class_property_set_description(ObjectClass *klass, const char *name, - const char *description, - Error **errp); + const char *description); /** * object_child_foreach: |