[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] migration: fix incorrect enable return path
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 2/5] migration: fix incorrect enable return path |
Date: |
Wed, 14 Jun 2017 13:51:35 +0200 |
From: Peter Xu <address@hidden>
0425dc9 is actually v1 of that patch, but it was accidentally
merged (while there was a v2). That will cause problem when we try to
migrate to some old QEMUs when return path is not really there. Let's
fix it, then squashing this patch with 0425dc9 will be exactly patch
content of v2.
Fixes: 0425dc9 ("migration: isolate return path on src")
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index 8ef6d6c..f9053b0 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1814,7 +1814,11 @@ static void *migration_thread(void *opaque)
qemu_savevm_state_header(s->to_dst_file);
- if (s->to_dst_file) {
+ /*
+ * If we opened the return path, we need to make sure dst has it
+ * opened as well.
+ */
+ if (s->rp_state.from_dst_file) {
/* Now tell the dest that it should open its end so it can reply */
qemu_savevm_send_open_return_path(s->to_dst_file);
--
2.9.4
- Re: [Qemu-devel] [PULL 0/5] Migration pull request, Peter Maydell, 2017/06/01
- [Qemu-devel] [PULL 0/5] Migration PULL request, Juan Quintela, 2017/06/14
- [Qemu-devel] [PULL 1/5] migration: Fix compilation with older compilers, Juan Quintela, 2017/06/14
- [Qemu-devel] [PULL 2/5] migration: fix incorrect enable return path,
Juan Quintela <=
- [Qemu-devel] [PULL 3/5] migration: Remove unneeded includes, Juan Quintela, 2017/06/14
- [Qemu-devel] [PULL 5/5] migration: Don't create decompression threads if not enabled, Juan Quintela, 2017/06/14
- [Qemu-devel] [PULL 4/5] migration: Test for disabled features on reception, Juan Quintela, 2017/06/14
- Re: [Qemu-devel] [PULL 0/5] Migration PULL request, Peter Maydell, 2017/06/15