diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-05-02 02:18:38 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-05-22 10:50:34 -0500 |
| commit | f8d926e9cd96e52ebcfd9ffdeab83c0d5e6b9622 (patch) | |
| tree | 510d530bbec3c739cc23fcc248fe188738fd0b28 /target-i386/machine.c | |
| parent | d33a1810d7f558dd1d486bc84f1cf8f96c982e2d (diff) | |
| download | focaccia-qemu-f8d926e9cd96e52ebcfd9ffdeab83c0d5e6b9622.tar.gz focaccia-qemu-f8d926e9cd96e52ebcfd9ffdeab83c0d5e6b9622.zip | |
kvm: x86: Save/restore KVM-specific CPU states
Save and restore all so far neglected KVM-specific CPU states. Handling the TSC stabilizes migration in KVM mode. The interrupt_bitmap and mp_state are currently unused, but will become relevant for in-kernel irqchip support. By including proper saving/restoring already, we avoid having to increment CPU_SAVE_VERSION later on once again. v2: - initialize mp_state runnable (for the boot CPU) Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 69a03a4df1..bb8b9dbd5a 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -140,6 +140,12 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_be64s(f, &env->mtrr_var[i].base); qemu_put_be64s(f, &env->mtrr_var[i].mask); } + + for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) { + qemu_put_be64s(f, &env->interrupt_bitmap[i]); + } + qemu_put_be64s(f, &env->tsc); + qemu_put_be32s(f, &env->mp_state); } #ifdef USE_X86LDOUBLE @@ -174,8 +180,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 && version_id != 5 - && version_id != 6 && version_id != 7 && version_id != 8) + if (version_id < 3 || version_id > CPU_SAVE_VERSION) return -EINVAL; for(i = 0; i < CPU_NB_REGS; i++) qemu_get_betls(f, &env->regs[i]); @@ -319,6 +324,13 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be64s(f, &env->mtrr_var[i].mask); } } + if (version_id >= 9) { + for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) { + qemu_get_be64s(f, &env->interrupt_bitmap[i]); + } + qemu_get_be64s(f, &env->tsc); + qemu_get_be32s(f, &env->mp_state); + } /* XXX: ensure compatiblity for halted bit ? */ /* XXX: compute redundant hflags bits */ |