commit 4ec7fcc7da214d48d39b63fd2c6a4d19ac42ae04
author Jan Kiszka <jan.kiszka@siemens.com> Mon Nov 30 18:21:21 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Thu Dec 03 10:48:53 2009 -0600
tree 5bb2081c5fbf6349a8241e715a0cece055105e72
parent 9a743e5ba32f7a620baa0b3d3808e88d2433e861

live migration: Allow cleanup after cancellation or error

Introduce qemu_savevm_state_cancel and inject a stage -1 to cancel a
live migration. This gives the involved subsystems a chance to clean up
dynamically allocated resources. Namely, the block migration layer can
now free its device descriptors and pending blocks.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

savevm.c

diff --git a/savevm.c b/savevm.c
index 17a6c97..9a7a78e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1299,8 +1299,10 @@
         se->save_live_state(f, QEMU_VM_SECTION_START, se->opaque);
     }
 
-    if (qemu_file_has_error(f))
+    if (qemu_file_has_error(f)) {
+        qemu_savevm_state_cancel(f);
         return -EIO;
+    }
 
     return 0;
 }
@@ -1324,8 +1326,10 @@
     if (ret)
         return 1;
 
-    if (qemu_file_has_error(f))
+    if (qemu_file_has_error(f)) {
+        qemu_savevm_state_cancel(f);
         return -EIO;
+    }
 
     return 0;
 }
@@ -1374,6 +1378,17 @@
     return 0;
 }
 
+void qemu_savevm_state_cancel(QEMUFile *f)
+{
+    SaveStateEntry *se;
+
+    QTAILQ_FOREACH(se, &savevm_handlers, entry) {
+        if (se->save_live_state) {
+            se->save_live_state(f, -1, se->opaque);
+        }
+    }
+}
+
 int qemu_savevm_state(QEMUFile *f)
 {
     int saved_vm_running;