OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

kvm: x86: Fix xcr0 reset mismerge

Browse Source 
For unknown reasons, xcr0 reset ended up in kvm_arch_update_guest_debug
on upstream merge. Fix this and also remove the misleading comment (1 is
THE reset value).

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-01-21 21:48:12 +01:00 committed by Marcelo Tosatti
parent 3390e7f797
commit 1a5e9d2faf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target-i386/kvm.c
View File

@ -450,6 +450,7 @@ void kvm_arch_reset_vcpu(CPUState *env)
env->interrupt_injected = -1; env->interrupt_injected = -1;
env->nmi_injected = 0; env->nmi_injected = 0;
env->nmi_pending = 0; env->nmi_pending = 0;
env->xcr0 = 1;
if (kvm_irqchip_in_kernel()) { if (kvm_irqchip_in_kernel()) {
env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE : env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE :
KVM_MP_STATE_UNINITIALIZED; KVM_MP_STATE_UNINITIALIZED;
@ -1759,8 +1760,6 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg)
((uint32_t)len_code[hw_breakpoint[n].len] << (18 + n*4)); ((uint32_t)len_code[hw_breakpoint[n].len] << (18 + n*4));
} }
} }
/* Legal xcr0 for loading */
env->xcr0 = 1;
} }
#endif /* KVM_CAP_SET_GUEST_DEBUG */ #endif /* KVM_CAP_SET_GUEST_DEBUG */