diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-17 23:19:53 +0300 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:35:30 -0500 |
| commit | 4c0960c0c483fffc5f8e1dab169d946ac295bf44 (patch) | |
| tree | 1dd3a77d60b3aa96132741326bdb3a8e66fa95c8 /target-i386/machine.c | |
| parent | qdev: convert watchdogs (diff) | |
| download | qemu-kvm-4c0960c0c483fffc5f8e1dab169d946ac295bf44.tar.gz qemu-kvm-4c0960c0c483fffc5f8e1dab169d946ac295bf44.tar.bz2 qemu-kvm-4c0960c0c483fffc5f8e1dab169d946ac295bf44.zip | |
kvm: Simplify cpu_synchronize_state()
cpu_synchronize_state() is a little unreadable since the 'modified'
argument isn't self-explanatory. Simplify it by making it always
synchronize the kernel state into qemu, and automatically flush the
registers back to the kernel if they've been synchronized on this
exit.
Signed-off-by: Avi Kivity <avi@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 8bf13cce8..ab3132902 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -32,7 +32,7 @@ void cpu_save(QEMUFile *f, void *opaque) int32_t pending_irq; int i, bit; - cpu_synchronize_state(env, 0); + cpu_synchronize_state(env); for(i = 0; i < CPU_NB_REGS; i++) qemu_put_betls(f, &env->regs[i]); @@ -206,6 +206,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) int32_t a20_mask; int32_t pending_irq; + cpu_synchronize_state(env); if (version_id < 3 || version_id > CPU_SAVE_VERSION) return -EINVAL; for(i = 0; i < CPU_NB_REGS; i++) @@ -380,6 +381,5 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) /* XXX: compute redundant hflags bits */ env->hflags = hflags; tlb_flush(env, 1); - cpu_synchronize_state(env, 1); return 0; } |