vl: Clean up user-creatable objects when exiting

Delete all user-creatable objects in /objects when exiting QEMU, so they
can perform cleanup actions.

Signed-off-by: Eduardo Habkost <[email protected]>
Message-Id: <20170824192315[email protected]>
Acked-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Zack Cornelius <[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>

diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index d63c1c28f8569302f4198206d5ccfe0467b18d5d..d23e11bc53e060dc925d1159e2ad7e661ba8b920 100644 (file)
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -147,4 +147,12 @@ int user_creatable_add_opts_foreach(void *opaque,
  */
 void user_creatable_del(const char *id, Error **errp);
 
+/**
+ * user_creatable_cleanup:
+ *
+ * Delete all user-creatable objects and the user-creatable
+ * objects container.
+ */
+void user_creatable_cleanup(void);
+
 #endif

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 3bb8959f09cf28c612759b8b2f350979f8629f1e..6824a88caabe071cca31bb0fa6749815f27a086b 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -193,6 +193,11 @@ void user_creatable_del(const char *id, Error **errp)
     object_unparent(obj);
 }
 
+void user_creatable_cleanup(void)
+{
+    object_unparent(object_get_objects_root());
+}
+
 static void register_types(void)
 {
     static const TypeInfo uc_interface_info = {

diff --git a/vl.c b/vl.c
index 9e62e92aea61694bd15625bea2212fe2cbf766a7..ad49314608e75e64248fbe891ec9ec2a2ad8bcdf 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4887,6 +4887,7 @@ int main(int argc, char **argv, char **envp)
     audio_cleanup();
     monitor_cleanup();
     qemu_chr_cleanup();
+    user_creatable_cleanup();
     /* TODO: unref root container, check all devices are ok */
 
     return 0;