motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

kvm: x86: Save/restore KVM-specific CPU states

Browse source 
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>
This commit is contained in:
Jan Kiszka 2009-05-02 02:18:38 +02:00 • committed by Anthony Liguori
parent d33a1810d7
commit f8d926e9cd
5 changed files with 49 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
target-i386/machine.c
View file

@ -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 */