x86: factor out cpu_pre_save()
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
66e6d55b75
commit
c4c38c8c72
|
@ -31,19 +31,13 @@ static void cpu_get_seg(QEMUFile *f, SegmentCache *dt)
|
||||||
vmstate_load_state(f, &vmstate_segment, dt, vmstate_segment.version_id);
|
vmstate_load_state(f, &vmstate_segment, dt, vmstate_segment.version_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cpu_save(QEMUFile *f, void *opaque)
|
static void cpu_pre_save(void *opaque)
|
||||||
{
|
{
|
||||||
CPUState *env = opaque;
|
CPUState *env = opaque;
|
||||||
int i, bit;
|
int i, bit;
|
||||||
|
|
||||||
cpu_synchronize_state(env);
|
cpu_synchronize_state(env);
|
||||||
|
|
||||||
for(i = 0; i < CPU_NB_REGS; i++)
|
|
||||||
qemu_put_betls(f, &env->regs[i]);
|
|
||||||
qemu_put_betls(f, &env->eip);
|
|
||||||
qemu_put_betls(f, &env->eflags);
|
|
||||||
qemu_put_be32s(f, &env->hflags);
|
|
||||||
|
|
||||||
/* FPU */
|
/* FPU */
|
||||||
env->fpus_vmstate = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
|
env->fpus_vmstate = (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11;
|
||||||
env->fptag_vmstate = 0;
|
env->fptag_vmstate = 0;
|
||||||
|
@ -51,15 +45,42 @@ void cpu_save(QEMUFile *f, void *opaque)
|
||||||
env->fptag_vmstate |= ((!env->fptags[i]) << i);
|
env->fptag_vmstate |= ((!env->fptags[i]) << i);
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_put_be16s(f, &env->fpuc);
|
|
||||||
qemu_put_be16s(f, &env->fpus_vmstate);
|
|
||||||
qemu_put_be16s(f, &env->fptag_vmstate);
|
|
||||||
|
|
||||||
#ifdef USE_X86LDOUBLE
|
#ifdef USE_X86LDOUBLE
|
||||||
env->fpregs_format_vmstate = 0;
|
env->fpregs_format_vmstate = 0;
|
||||||
#else
|
#else
|
||||||
env->fpregs_format_vmstate = 1;
|
env->fpregs_format_vmstate = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* There can only be one pending IRQ set in the bitmap at a time, so try
|
||||||
|
to find it and save its number instead (-1 for none). */
|
||||||
|
env->pending_irq_vmstate = -1;
|
||||||
|
for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) {
|
||||||
|
if (env->interrupt_bitmap[i]) {
|
||||||
|
bit = ctz64(env->interrupt_bitmap[i]);
|
||||||
|
env->pending_irq_vmstate = i * 64 + bit;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void cpu_save(QEMUFile *f, void *opaque)
|
||||||
|
{
|
||||||
|
CPUState *env = opaque;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
cpu_pre_save(opaque);
|
||||||
|
|
||||||
|
for(i = 0; i < CPU_NB_REGS; i++)
|
||||||
|
qemu_put_betls(f, &env->regs[i]);
|
||||||
|
qemu_put_betls(f, &env->eip);
|
||||||
|
qemu_put_betls(f, &env->eflags);
|
||||||
|
qemu_put_be32s(f, &env->hflags);
|
||||||
|
|
||||||
|
/* FPU */
|
||||||
|
qemu_put_be16s(f, &env->fpuc);
|
||||||
|
qemu_put_be16s(f, &env->fpus_vmstate);
|
||||||
|
qemu_put_be16s(f, &env->fptag_vmstate);
|
||||||
|
|
||||||
qemu_put_be16s(f, &env->fpregs_format_vmstate);
|
qemu_put_be16s(f, &env->fpregs_format_vmstate);
|
||||||
|
|
||||||
for(i = 0; i < 8; i++) {
|
for(i = 0; i < 8; i++) {
|
||||||
|
@ -146,16 +167,6 @@ void cpu_save(QEMUFile *f, void *opaque)
|
||||||
|
|
||||||
/* KVM-related states */
|
/* KVM-related states */
|
||||||
|
|
||||||
/* There can only be one pending IRQ set in the bitmap at a time, so try
|
|
||||||
to find it and save its number instead (-1 for none). */
|
|
||||||
env->pending_irq_vmstate = -1;
|
|
||||||
for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) {
|
|
||||||
if (env->interrupt_bitmap[i]) {
|
|
||||||
bit = ctz64(env->interrupt_bitmap[i]);
|
|
||||||
env->pending_irq_vmstate = i * 64 + bit;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
qemu_put_sbe32s(f, &env->pending_irq_vmstate);
|
qemu_put_sbe32s(f, &env->pending_irq_vmstate);
|
||||||
qemu_put_be32s(f, &env->mp_state);
|
qemu_put_be32s(f, &env->mp_state);
|
||||||
qemu_put_be64s(f, &env->tsc);
|
qemu_put_be64s(f, &env->tsc);
|
||||||
|
|
Reference in New Issue