diff mbox

[v6,1/2] qom: Add can_be_deleted callback to UserCreatableClass

Message ID 1427704589-7688-2-git-send-email-lma@suse.com
State New
Headers show

Commit Message

Lin Ma March 30, 2015, 8:36 a.m. UTC 
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 <lma@suse.com>
---
 include/qom/object_interfaces.h | 13 +++++++++++++
 qmp.c                           |  5 +++++
 qom/object_interfaces.c         | 12 ++++++++++++
 3 files changed, 30 insertions(+)

Comments

Andreas Färber March 31, 2015, 10:48 a.m. UTC | #1 
Am 30.03.2015 um 10:36 schrieb 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 <lma@suse.com>
> ---
>  include/qom/object_interfaces.h | 13 +++++++++++++
>  qmp.c                           |  5 +++++
>  qom/object_interfaces.c         | 12 ++++++++++++
>  3 files changed, 30 insertions(+)

Fine with me,

Reviewed-by: Andreas Färber <afaerber@suse.de>

I'm expecting this will go through Paolo's or QMP tree.

Andreas
Paolo Bonzini March 31, 2015, 10:51 a.m. UTC | #2 
On 31/03/2015 12:48, Andreas Färber wrote:
> Am 30.03.2015 um 10:36 schrieb 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 <lma@suse.com>
>> ---
>>  include/qom/object_interfaces.h | 13 +++++++++++++
>>  qmp.c                           |  5 +++++
>>  qom/object_interfaces.c         | 12 ++++++++++++
>>  3 files changed, 30 insertions(+)
> 
> Fine with me,
> 
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> 
> I'm expecting this will go through Paolo's or QMP tree.

Yes, I'm waiting for some reviews on the ioport patches, otherwise I'll
send the pull request after -rc2 (don't want to send out unreviewed
patches hours before we ship it).

Paolo
diff mbox

Patch

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 {
 
     /* <public> */
     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 = {