ACPI: don't call acpi_pcihp_device_plug_cb on xen

[mirror_qemu.git] / qmp.c

diff --git a/qmp.c b/qmp.c
index dfaabac1a6ca975e74ffe87b176f1d54da3bf018..a744e44ac65ee256939868addc2cf6f49974a10b 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -207,6 +207,12 @@ void qmp_cont(Error **errp)
         }
     }
 
+    blk_resume_after_migration(&local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
     if (runstate_check(RUN_STATE_INMIGRATE)) {
         autostart = 1;
     } else {
@@ -675,7 +681,7 @@ void qmp_object_add(const char *type, const char *id,
         pdict = qdict_new();
     }
 
-    v = qobject_input_visitor_new(QOBJECT(pdict), true);
+    v = qobject_input_visitor_new(QOBJECT(pdict));
     obj = user_creatable_add_type(type, id, pdict, v, errp);
     visit_free(v);
     if (obj) {