diff options
| author |   Avi Kivity <avi@qumranet.com> | 2008-07-10 12:22:20 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-07-10 12:22:20 +0300 |
| commit | 9c2e8d239627662b3e0f2e7c5ea7ba2877101426 (patch) | |
| tree | 9c4b887eef0450f2647cd981e492440b0a284cd8 /target-i386/machine.c | |
| parent | kvm: testsuite: consilidate test libs to libcflat for single lib for all arch (diff) | |
| parent | Restore old value of buffer_size (diff) | |
| download | qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.tar.gz qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.tar.bz2 qemu-kvm-9c2e8d239627662b3e0f2e7c5ea7ba2877101426.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block-raw-posix.c
qemu/configure
qemu/exec.c
qemu/hw/pc.c
qemu/sysemu.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 0da657f3b..a3da01a1b 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -128,7 +128,6 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_be32s(f, &env->smbase); qemu_put_be64s(f, &env->pat); qemu_put_be32s(f, &env->hflags2); - qemu_put_be32s(f, (uint32_t *)&env->halted); qemu_put_be64s(f, &env->vm_hsave); qemu_put_be64s(f, &env->vm_vmcb); @@ -182,7 +181,8 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) uint16_t fpus, fpuc, fptag, fpregs_format; int32_t a20_mask; - if (version_id != 3 && version_id != 4 && version_id != 5) + if (version_id != 3 && version_id != 4 && version_id != 5 + && version_id != 6) return -EINVAL; for(i = 0; i < CPU_NB_REGS; i++) qemu_get_betls(f, &env->regs[i]); @@ -292,7 +292,8 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) if (version_id >= 5) { qemu_get_be64s(f, &env->pat); qemu_get_be32s(f, &env->hflags2); - qemu_get_be32s(f, (uint32_t *)&env->halted); + if (version_id < 6) + qemu_get_be32s(f, &env->halted); qemu_get_be64s(f, &env->vm_hsave); qemu_get_be64s(f, &env->vm_vmcb); |