diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2009-11-30 18:21:21 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 10:48:53 -0600 |
| commit | 4ec7fcc7da214d48d39b63fd2c6a4d19ac42ae04 (patch) | |
| tree | 5bb2081c5fbf6349a8241e715a0cece055105e72 /savevm.c | |
| parent | ram migration: Stop loading on error (diff) | |
| download | qemu-kvm-4ec7fcc7da214d48d39b63fd2c6a4d19ac42ae04.tar.gz qemu-kvm-4ec7fcc7da214d48d39b63fd2c6a4d19ac42ae04.tar.bz2 qemu-kvm-4ec7fcc7da214d48d39b63fd2c6a4d19ac42ae04.zip | |
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>
Diffstat (limited to 'savevm.c')
| -rw-r--r-- | savevm.c | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -1299,8 +1299,10 @@ int qemu_savevm_state_begin(QEMUFile *f, int blk_enable, int shared) 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 @@ int qemu_savevm_state_iterate(QEMUFile *f) 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 @@ int qemu_savevm_state_complete(QEMUFile *f) 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; |