Re: [PATCH] make migration work again

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Glauber Costa wrote:
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(-)


Strange diffstat.

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;

I think you want to remove the first line as well? Only accept version_id == 9? And keep the comment.

--
error compiling committee.c: too many arguments to function

--
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

[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux