diff options
| -rw-r--r-- | hw/pc.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.h | 4 | ||||
| -rw-r--r-- | target-i386/machine.c | 40 |
3 files changed, 39 insertions, 7 deletions
@@ -766,7 +766,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, /* XXX: enable it in all cases */ env->cpuid_features |= CPUID_APIC; } - register_savevm("cpu", i, 4, cpu_save, cpu_load, env); + register_savevm("cpu", i, 5, cpu_save, cpu_load, env); qemu_register_reset(main_cpu_reset, env); if (pci_enabled) { apic_init(env); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 18cb6addd7..d80ffb8718 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -541,8 +541,8 @@ typedef struct CPUX86State { uint64_t efer; uint64_t star; - target_phys_addr_t vm_hsave; - target_phys_addr_t vm_vmcb; + uint64_t vm_hsave; + uint64_t vm_vmcb; uint64_t tsc_offset; uint64_t intercept; uint16_t intercept_cr_read; diff --git a/target-i386/machine.c b/target-i386/machine.c index f88d5ed811..938c49591c 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -120,6 +120,21 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_be64s(f, &env->kernelgsbase); #endif 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); + qemu_put_be64s(f, &env->tsc_offset); + qemu_put_be64s(f, &env->intercept); + qemu_put_be16s(f, &env->intercept_cr_read); + qemu_put_be16s(f, &env->intercept_cr_write); + qemu_put_be16s(f, &env->intercept_dr_read); + qemu_put_be16s(f, &env->intercept_dr_write); + qemu_put_be32s(f, &env->intercept_exceptions); + qemu_put_8s(f, &env->v_tpr); } #ifdef USE_X86LDOUBLE @@ -154,7 +169,7 @@ 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) + if (version_id != 3 && version_id != 4 && version_id != 5) return -EINVAL; for(i = 0; i < CPU_NB_REGS; i++) qemu_get_betls(f, &env->regs[i]); @@ -258,10 +273,27 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be64s(f, &env->fmask); qemu_get_be64s(f, &env->kernelgsbase); #endif - if (version_id >= 4) + if (version_id >= 4) { qemu_get_be32s(f, &env->smbase); - - /* XXX: compute hflags from scratch, except for CPL and IIF */ + } + if (version_id >= 5) { + qemu_get_be64s(f, &env->pat); + qemu_get_be32s(f, &env->hflags2); + qemu_get_be32s(f, (uint32_t *)&env->halted); + + qemu_get_be64s(f, &env->vm_hsave); + qemu_get_be64s(f, &env->vm_vmcb); + qemu_get_be64s(f, &env->tsc_offset); + qemu_get_be64s(f, &env->intercept); + qemu_get_be16s(f, &env->intercept_cr_read); + qemu_get_be16s(f, &env->intercept_cr_write); + qemu_get_be16s(f, &env->intercept_dr_read); + qemu_get_be16s(f, &env->intercept_dr_write); + qemu_get_be32s(f, &env->intercept_exceptions); + qemu_get_8s(f, &env->v_tpr); + } + /* XXX: ensure compatiblity for halted bit ? */ + /* XXX: compute redundant hflags bits */ env->hflags = hflags; tlb_flush(env, 1); return 0; |