diff options
author | Avi Kivity <avi@redhat.com> | 2009-08-31 12:09:49 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-08-31 12:34:43 +0300 |
commit | 54d2473ed6e9733b508a2dcc589435779e2cc7f0 (patch) | |
tree | 44c276f2a691a4eb7c4d1bc96daaeb917dbf7b52 /qemu-kvm.c | |
parent | Merge branch 'upstream-merge' (diff) | |
download | qemu-kvm-54d2473ed6e9733b508a2dcc589435779e2cc7f0.tar.gz qemu-kvm-54d2473ed6e9733b508a2dcc589435779e2cc7f0.tar.bz2 qemu-kvm-54d2473ed6e9733b508a2dcc589435779e2cc7f0.zip |
Fix mpstate reloads
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
-rw-r--r-- | qemu-kvm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 2d3ca7166..d554749c3 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -878,7 +878,6 @@ void kvm_cpu_synchronize_state(CPUState *env) { if (!env->kvm_cpu_state.regs_modified) { kvm_arch_get_registers(env); - kvm_arch_save_mpstate(env); env->kvm_cpu_state.regs_modified = 1; } } @@ -966,8 +965,8 @@ int kvm_run(kvm_vcpu_context_t vcpu, void *env) #endif if (_env->kvm_cpu_state.regs_modified) { + printf("%s: cpu %d mp_state %d\n", __func__, _env->cpu_index, _env->mp_state); kvm_arch_put_registers(_env); - kvm_arch_load_mpstate(_env); _env->kvm_cpu_state.regs_modified = 0; } @@ -1609,7 +1608,6 @@ static void kvm_do_save_mpstate(void *_env) CPUState *env = _env; kvm_arch_save_mpstate(env); - env->halted = (env->mp_state == KVM_MP_STATE_HALTED); } void kvm_save_mpstate(CPUState *env) |