aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-04-29 15:53:50 -0500
committerAvi Kivity <avi@redhat.com>2009-04-30 16:27:50 +0300
commit7b2e5abac640770ffd15b71e4345114bf10191ab (patch)
tree8b1a8438da45b64ca779a72bab4f9cb7ec45e356 /target-i386/machine.c
parentIncrement virtio-net savevm version to avoid conflict with upstream QEMU. (diff)
downloadqemu-kvm-7b2e5abac640770ffd15b71e4345114bf10191ab.tar.gz
qemu-kvm-7b2e5abac640770ffd15b71e4345114bf10191ab.tar.bz2
qemu-kvm-7b2e5abac640770ffd15b71e4345114bf10191ab.zip
Increment version id for CPU save state
9 is reserved for KVM. KVM cannot support migration from any other version. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/machine.c')
-rw-r--r--target-i386/machine.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 399204deb..7f75d3109 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -196,6 +196,9 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
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)
+ return -EINVAL;
for(i = 0; i < CPU_NB_REGS; i++)
qemu_get_betls(f, &env->regs[i]);
qemu_get_betls(f, &env->eip);