From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmwMG-0006m3-Vk for qemu-devel@nongnu.org; Wed, 30 Aug 2017 02:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmwMB-00037d-Tf for qemu-devel@nongnu.org; Wed, 30 Aug 2017 02:20:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60120) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dmwMB-00036C-KV for qemu-devel@nongnu.org; Wed, 30 Aug 2017 02:20:07 -0400 Date: Wed, 30 Aug 2017 08:20:01 +0200 From: Igor Mammedov Message-ID: <20170830082001.7c9346dc@nial.brq.redhat.com> In-Reply-To: <20170829220337.23427-1-ehabkost@redhat.com> References: <20170829220337.23427-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qom: Remove unused errp parameter from can_be_deleted() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, Gonglei , Paolo Bonzini , Andreas =?UTF-8?B?RsOkcmJlcg==?= , Lin Ma On Tue, 29 Aug 2017 19:03:37 -0300 Eduardo Habkost 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 Reviewed-by: Igor Mammedov > --- > 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 { > > /* */ > 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; > }