diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-09-29 22:48:49 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:39 -0500 |
| commit | 5ee0ffaa42b02e04d8047c7fc32687b348719294 (patch) | |
| tree | cfe863b16d67c383de96ef2dd237444fe6b7fc74 /target-i386/machine.c | |
| parent | 1f76b9b9b3b78fb51c917d3f3efa6fff1e57a734 (diff) | |
| download | hqemu-5ee0ffaa42b02e04d8047c7fc32687b348719294.zip hqemu-5ee0ffaa42b02e04d8047c7fc32687b348719294.tar.gz | |
x86: make a20_mask int32_t
This makes the savevm code correct, and sign extensins gives us exactly
what we need (namely, sign extend to 64 bits when used with 64bit addresess.
Once there, change 0x100000 for 1 << 20, that maks all a20 use the same syntax.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index adbb16f..23c01ee 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -27,7 +27,6 @@ void cpu_save(QEMUFile *f, void *opaque) { CPUState *env = opaque; uint16_t fptag, fpus, fpuc, fpregs_format; - int32_t a20_mask; int32_t pending_irq; int i, bit; @@ -98,8 +97,7 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_betls(f, &env->dr[i]); /* MMU */ - a20_mask = (int32_t) env->a20_mask; - qemu_put_sbe32s(f, &a20_mask); + qemu_put_sbe32s(f, &env->a20_mask); /* XMM */ qemu_put_be32s(f, &env->mxcsr); @@ -201,7 +199,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) CPUState *env = opaque; int i, guess_mmx; uint16_t fpus, fpuc, fptag, fpregs_format; - int32_t a20_mask; int32_t pending_irq; cpu_synchronize_state(env); @@ -300,9 +297,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < 4; i++) hw_breakpoint_insert(env, i); - /* MMU */ - qemu_get_sbe32s(f, &a20_mask); - env->a20_mask = a20_mask; + qemu_get_sbe32s(f, &env->a20_mask); qemu_get_be32s(f, &env->mxcsr); for(i = 0; i < CPU_NB_REGS; i++) { |
