Due to a small messup in version checking, migration was not working.
fix it.
Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx>
---
migration-tcp.c | 1 +
savevm.c | 1 +
target-i386/helper.c | 1 +
target-i386/machine.c | 8 ++++----
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 7f75d31..c1e05c5 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -194,11 +194,11 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
int32_t a20_mask;
if (version_id != 3 && version_id != 4 && version_id != 5
- && version_id != 6 && version_id != 7 && version_id != 8)
- return -EINVAL;
- /* KVM cannot accept migrations from QEMU today */
- if (version_id != 9)
+ && version_id != 6 && version_id != 7 && version_id != 8
+ /* KVM cannot accept migrations from QEMU today */
+ && version_id != 9)
return -EINVAL;
+
for(i = 0; i < CPU_NB_REGS; i++)
qemu_get_betls(f, &env->regs[i]);
qemu_get_betls(f, &env->eip);
--
1.6.2.2
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
