From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFu7-0006Y5-KV for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdFu2-0000g9-ND for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFu2-0000fr-E6 for qemu-devel@nongnu.org; Wed, 01 Apr 2015 06:29:42 -0400 From: Paolo Bonzini Date: Wed, 1 Apr 2015 12:29:33 +0200 Message-Id: <1427884177-4928-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1427884177-4928-1-git-send-email-pbonzini@redhat.com> References: <1427884177-4928-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 1/5] qom: Add can_be_deleted callback to UserCreatableClass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Lin Ma From: Lin Ma If backends implement the can_be_deleted and it returns false, Then the qmp_object_del won't delete the given backends. Signed-off-by: Lin Ma Message-Id: <1427704589-7688-2-git-send-email-lma@suse.com> Reviewed-by: Igor Mammedov Signed-off-by: Paolo Bonzini --- include/qom/object_interfaces.h | 13 +++++++++++++ qmp.c | 5 +++++ qom/object_interfaces.c | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index b792283..283ae0d 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -25,6 +25,8 @@ typedef struct UserCreatable { * UserCreatableClass: * @parent_class: the base class * @complete: callback to be called after @obj's properties are set. + * @can_be_deleted: callback to be called before an object is removed + * to check if @obj can be removed safely. * * Interface is designed to work with -object/object-add/object_add * commands. @@ -47,6 +49,7 @@ typedef struct UserCreatableClass { /* */ void (*complete)(UserCreatable *uc, Error **errp); + bool (*can_be_deleted)(UserCreatable *uc, Error **errp); } UserCreatableClass; /** @@ -59,4 +62,14 @@ typedef struct UserCreatableClass { * nothing. */ 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); #endif diff --git a/qmp.c b/qmp.c index c479e77..e6c7050 100644 --- a/qmp.c +++ b/qmp.c @@ -711,6 +711,11 @@ void qmp_object_del(const char *id, Error **errp) error_setg(errp, "object id not found"); return; } + + if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) { + error_setg(errp, "%s is in use, can not be deleted", id); + return; + } object_unparent(obj); } diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 6360818..a66cd60 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -18,6 +18,18 @@ void user_creatable_complete(Object *obj, Error **errp) } } +bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp) +{ + + UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc); + + if (ucc->can_be_deleted) { + return ucc->can_be_deleted(uc, errp); + } else { + return true; + } +} + static void register_types(void) { static const TypeInfo uc_interface_info = { -- 2.3.4