ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: hflags is not modified at all, just save it directly 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-29 22:48:48 +02:00 committed by Anthony Liguori
parent 6b0e766f4c
commit 1f76b9b9b3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target-i386/machine.c
View File

@ -27,7 +27,6 @@ void cpu_save(QEMUFile *f, void *opaque)
{ {
CPUState *env = opaque; CPUState *env = opaque;
uint16_t fptag, fpus, fpuc, fpregs_format; uint16_t fptag, fpus, fpuc, fpregs_format;
uint32_t hflags;
int32_t a20_mask; int32_t a20_mask;
int32_t pending_irq; int32_t pending_irq;
int i, bit; int i, bit;
@ -38,8 +37,7 @@ void cpu_save(QEMUFile *f, void *opaque)
qemu_put_betls(f, &env->regs[i]); qemu_put_betls(f, &env->regs[i]);
qemu_put_betls(f, &env->eip); qemu_put_betls(f, &env->eip);
qemu_put_betls(f, &env->eflags); qemu_put_betls(f, &env->eflags);
hflags = env->hflags; /* XXX: suppress most of the redundant hflags */ qemu_put_be32s(f, &env->hflags);
qemu_put_be32s(f, &hflags);
/* FPU */ /* FPU */
fpuc = env->fpuc; fpuc = env->fpuc;
@ -202,7 +200,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
{ {
CPUState *env = opaque; CPUState *env = opaque;
int i, guess_mmx; int i, guess_mmx;
uint32_t hflags;
uint16_t fpus, fpuc, fptag, fpregs_format; uint16_t fpus, fpuc, fptag, fpregs_format;
int32_t a20_mask; int32_t a20_mask;
int32_t pending_irq; int32_t pending_irq;
@ -214,7 +211,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_betls(f, &env->regs[i]); qemu_get_betls(f, &env->regs[i]);
qemu_get_betls(f, &env->eip); qemu_get_betls(f, &env->eip);
qemu_get_betls(f, &env->eflags); qemu_get_betls(f, &env->eflags);
qemu_get_be32s(f, &hflags); qemu_get_be32s(f, &env->hflags);
qemu_get_be16s(f, &fpuc); qemu_get_be16s(f, &fpuc);
qemu_get_be16s(f, &fpus); qemu_get_be16s(f, &fpus);
@ -381,9 +378,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)
if (version_id >= 11) { if (version_id >= 11) {
qemu_get_be64s(f, &env->tsc_aux); qemu_get_be64s(f, &env->tsc_aux);
} }
/* XXX: ensure compatiblity for halted bit ? */
/* XXX: compute redundant hflags bits */
env->hflags = hflags;
tlb_flush(env, 1); tlb_flush(env, 1);
return 0; return 0;
} }