[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] migration: fix inability to save VM after snap
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PULL 03/13] migration: fix inability to save VM after snapshot |
Date: |
Fri, 17 Jun 2016 18:36:42 +0530 |
From: "Denis V. Lunev" <address@hidden>
The following sequence of operations fails:
virsh start vm
virsh snapshot-create vm
virshh save vm --file file
with the following error
error: Failed to save domain vm to file
error: internal error: unable to execute QEMU command 'migrate':
There's a migration process in progress
The problem is that qemu_savevm_state() calls migrate_init() which sets
migration state to MIGRATION_STATUS_SETUP and never cleaned it up.
This patch do the job.
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
CC: Juan Quintela <address@hidden>
CC: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
migration/savevm.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 6da084c..38b85ee 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1150,10 +1150,12 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
.shared = 0
};
MigrationState *ms = migrate_init(¶ms);
+ MigrationStatus status;
ms->to_dst_file = f;
if (migration_is_blocked(errp)) {
- return -EINVAL;
+ ret = -EINVAL;
+ goto done;
}
qemu_mutex_unlock_iothread();
@@ -1176,6 +1178,14 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
if (ret != 0) {
error_setg_errno(errp, -ret, "Error while writing VM state");
}
+
+done:
+ if (ret != 0) {
+ status = MIGRATION_STATUS_FAILED;
+ } else {
+ status = MIGRATION_STATUS_COMPLETED;
+ }
+ migrate_set_state(&ms->state, MIGRATION_STATUS_SETUP, status);
return ret;
}
--
2.7.4
- [Qemu-devel] [PULL 00/13] migration: many fixes, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 02/13] migration: Trace improvements, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 01/13] migration: Don't use *_to_cpup() and cpu_to_*w(), Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 04/13] migration: Fix multi-thread compression bug, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 03/13] migration: fix inability to save VM after snapshot,
Amit Shah <=
- [Qemu-devel] [PULL 06/13] migration: remove useless code, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 08/13] migration: refine ram_save_compressed_page, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 07/13] qemu-file: Fix qemu_put_compression_data flaw, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 05/13] migration: Fix a potential issue, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 09/13] migration: protect the quit flag by lock, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 11/13] migration: refine the decompression code, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 10/13] migration: refine the compression code, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 12/13] migration: code clean up, Amit Shah, 2016/06/17
- [Qemu-devel] [PULL 13/13] vmstate-static-checker: fix size mismatch detection in unused fields, Amit Shah, 2016/06/17
- Re: [Qemu-devel] [PULL 00/13] migration: many fixes, Peter Maydell, 2016/06/17