Message ID | 20170829220337.23427-1-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
Series | qom: Remove unused errp parameter from can_be_deleted() | expand |
> -----Original Message----- > From: Eduardo Habkost [mailto:ehabkost@redhat.com] > Sent: Wednesday, August 30, 2017 6:04 AM > To: qemu-devel@nongnu.org > Cc: Gonglei (Arei); Paolo Bonzini; Igor Mammedov; Andreas Färber; Lin Ma > Subject: [PATCH] qom: Remove unused errp parameter from can_be_deleted() > > The errp argument is ignored by all implementations of the > method, and user_creatable_del() would break if any > implementation set an error (because it calls error_setg(errp) if > the function returns false). Remove the unused parameter. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > include/qom/object_interfaces.h | 5 ++--- > backends/cryptodev.c | 2 +- > backends/hostmem.c | 2 +- > qom/object_interfaces.c | 6 +++--- > 4 files changed, 7 insertions(+), 8 deletions(-) > Reviewed-by: Gonglei <arei.gonglei@huawei.com>
On Tue, 29 Aug 2017 19:03:37 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > The errp argument is ignored by all implementations of the > method, and user_creatable_del() would break if any > implementation set an error (because it calls error_setg(errp) if > the function returns false). Remove the unused parameter. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > include/qom/object_interfaces.h | 5 ++--- > backends/cryptodev.c | 2 +- > backends/hostmem.c | 2 +- > qom/object_interfaces.c | 6 +++--- > 4 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h > index fdd7603..d63c1c2 100644 > --- a/include/qom/object_interfaces.h > +++ b/include/qom/object_interfaces.h > @@ -51,7 +51,7 @@ typedef struct UserCreatableClass { > > /* <public> */ > void (*complete)(UserCreatable *uc, Error **errp); > - bool (*can_be_deleted)(UserCreatable *uc, Error **errp); > + bool (*can_be_deleted)(UserCreatable *uc); > } UserCreatableClass; > > /** > @@ -68,12 +68,11 @@ void user_creatable_complete(Object *obj, Error **errp); > /** > * user_creatable_can_be_deleted: > * @uc: the object whose can_be_deleted() method is called if implemented > - * @errp: if an error occurs, a pointer to an area to store the error > * > * Wrapper to call can_be_deleted() method if one of types it's inherited > * from implements USER_CREATABLE interface. > */ > -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp); > +bool user_creatable_can_be_deleted(UserCreatable *uc); > > /** > * user_creatable_add_type: > diff --git a/backends/cryptodev.c b/backends/cryptodev.c > index 1764c17..67edfa5 100644 > --- a/backends/cryptodev.c > +++ b/backends/cryptodev.c > @@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend) > } > > static bool > -cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp) > +cryptodev_backend_can_be_deleted(UserCreatable *uc) > { > return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc)); > } > diff --git a/backends/hostmem.c b/backends/hostmem.c > index 4606b73..34550b9 100644 > --- a/backends/hostmem.c > +++ b/backends/hostmem.c > @@ -342,7 +342,7 @@ out: > } > > static bool > -host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp) > +host_memory_backend_can_be_deleted(UserCreatable *uc) > { > if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) { > return false; > diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c > index ff27e06..3bb8959 100644 > --- a/qom/object_interfaces.c > +++ b/qom/object_interfaces.c > @@ -23,13 +23,13 @@ void user_creatable_complete(Object *obj, Error **errp) > } > } > > -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp) > +bool user_creatable_can_be_deleted(UserCreatable *uc) > { > > UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc); > > if (ucc->can_be_deleted) { > - return ucc->can_be_deleted(uc, errp); > + return ucc->can_be_deleted(uc); > } else { > return true; > } > @@ -178,7 +178,7 @@ void user_creatable_del(const char *id, Error **errp) > return; > } > > - if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) { > + if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) { > error_setg(errp, "object '%s' is in use, can not be deleted", id); > return; > }
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index fdd7603..d63c1c2 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -51,7 +51,7 @@ typedef struct UserCreatableClass { /* <public> */ void (*complete)(UserCreatable *uc, Error **errp); - bool (*can_be_deleted)(UserCreatable *uc, Error **errp); + bool (*can_be_deleted)(UserCreatable *uc); } UserCreatableClass; /** @@ -68,12 +68,11 @@ void user_creatable_complete(Object *obj, Error **errp); /** * user_creatable_can_be_deleted: * @uc: the object whose can_be_deleted() method is called if implemented - * @errp: if an error occurs, a pointer to an area to store the error * * Wrapper to call can_be_deleted() method if one of types it's inherited * from implements USER_CREATABLE interface. */ -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp); +bool user_creatable_can_be_deleted(UserCreatable *uc); /** * user_creatable_add_type: diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 1764c17..67edfa5 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend) } static bool -cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp) +cryptodev_backend_can_be_deleted(UserCreatable *uc) { return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc)); } diff --git a/backends/hostmem.c b/backends/hostmem.c index 4606b73..34550b9 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -342,7 +342,7 @@ out: } static bool -host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp) +host_memory_backend_can_be_deleted(UserCreatable *uc) { if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) { return false; diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ff27e06..3bb8959 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -23,13 +23,13 @@ void user_creatable_complete(Object *obj, Error **errp) } } -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp) +bool user_creatable_can_be_deleted(UserCreatable *uc) { UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc); if (ucc->can_be_deleted) { - return ucc->can_be_deleted(uc, errp); + return ucc->can_be_deleted(uc); } else { return true; } @@ -178,7 +178,7 @@ void user_creatable_del(const char *id, Error **errp) return; } - if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) { + if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) { error_setg(errp, "object '%s' is in use, can not be deleted", id); return; }
The errp argument is ignored by all implementations of the method, and user_creatable_del() would break if any implementation set an error (because it calls error_setg(errp) if the function returns false). Remove the unused parameter. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- include/qom/object_interfaces.h | 5 ++--- backends/cryptodev.c | 2 +- backends/hostmem.c | 2 +- qom/object_interfaces.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)