diff options
author | 2009-08-17 23:19:53 +0300 | |
---|---|---|
committer | 2009-08-27 20:35:30 -0500 | |
commit | 4c0960c0c483fffc5f8e1dab169d946ac295bf44 (patch) | |
tree | 1dd3a77d60b3aa96132741326bdb3a8e66fa95c8 /exec.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 'exec.c')
-rw-r--r-- | exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -519,7 +519,7 @@ static void cpu_common_save(QEMUFile *f, void *opaque) { CPUState *env = opaque; - cpu_synchronize_state(env, 0); + cpu_synchronize_state(env); qemu_put_be32s(f, &env->halted); qemu_put_be32s(f, &env->interrupt_request); @@ -529,6 +529,7 @@ static int cpu_common_load(QEMUFile *f, void *opaque, int version_id) { CPUState *env = opaque; + cpu_synchronize_state(env); if (version_id != CPU_COMMON_SAVE_VERSION) return -EINVAL; @@ -538,7 +539,6 @@ static int cpu_common_load(QEMUFile *f, void *opaque, int version_id) version_id is increased. */ env->interrupt_request &= ~0x01; tlb_flush(env, 1); - cpu_synchronize_state(env, 1); return 0; } |