From: Amit Shah <amit.shah@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Juan Quintela <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
liang.z.li@intel.com, den@openvz.org,
qemu list <qemu-devel@nongnu.org>,
Amit Shah <amit.shah@redhat.com>
Subject: [Qemu-devel] [PULL 03/13] migration: fix inability to save VM after snapshot
Date: Fri, 17 Jun 2016 18:36:42 +0530 [thread overview]
Message-ID: <6dcf66681aea2a371ddd63770bf80615652f5c94.1466168448.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1466168448.git.amit.shah@redhat.com>
In-Reply-To: <cover.1466168448.git.amit.shah@redhat.com>
From: "Denis V. Lunev" <den@openvz.org>
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 <den@openvz.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
CC: Juan Quintela <quintela@redhat.com>
CC: Amit Shah <amit.shah@redhat.com>
Message-Id: <1466003203-26263-1-git-send-email-den@openvz.org>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
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
next prev parent reply other threads:[~2016-06-17 13:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 13:06 [Qemu-devel] [PULL 00/13] migration: many fixes Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 01/13] migration: Don't use *_to_cpup() and cpu_to_*w() Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 02/13] migration: Trace improvements Amit Shah
2016-06-17 13:06 ` Amit Shah [this message]
2016-06-17 13:06 ` [Qemu-devel] [PULL 04/13] migration: Fix multi-thread compression bug Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 05/13] migration: Fix a potential issue Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 06/13] migration: remove useless code Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 07/13] qemu-file: Fix qemu_put_compression_data flaw Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 08/13] migration: refine ram_save_compressed_page Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 09/13] migration: protect the quit flag by lock Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 10/13] migration: refine the compression code Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 11/13] migration: refine the decompression code Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 12/13] migration: code clean up Amit Shah
2016-06-17 13:06 ` [Qemu-devel] [PULL 13/13] vmstate-static-checker: fix size mismatch detection in unused fields Amit Shah
2016-06-17 13:58 ` [Qemu-devel] [PULL 00/13] migration: many fixes Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6dcf66681aea2a371ddd63770bf80615652f5c94.1466168448.git.amit.shah@redhat.com \
--to=amit.shah@redhat.com \
--cc=den@openvz.org \
--cc=dgilbert@redhat.com \
--cc=liang.z.li@intel.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.