apic_common: improve readability of apic_reset_common

[mirror_qemu.git] / qmp.c

diff --git a/qmp.c b/qmp.c
index d701cff5ac1f764cddd3461fc09e3e57381491bf..e6c70504df855069530275ceb680ca9b14304a46 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -391,7 +391,6 @@ static void qmp_change_vnc_listen(const char *target, Error **errp)
         return;
     }
 
-    vnc_auto_assign_id(olist, opts);
     vnc_display_open("default", errp);
 }
 
@@ -712,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);
 }