diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-01-21 21:48:12 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-01-23 02:27:21 -0200 |
| commit | 1a5e9d2fafa5d31587e218cea462637bfad52b53 (patch) | |
| tree | 00f5985332cb808528115e42a579764790ae5920 /target-i386 | |
| parent | 3390e7f79784cbc75df408740cda4edbcf57ac58 (diff) | |
| download | qemu-1a5e9d2fafa5d31587e218cea462637bfad52b53.tar.gz | |
kvm: x86: Fix xcr0 reset mismerge
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>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 07c75c00ad..c4a22dd58f 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -450,6 +450,7 @@ void kvm_arch_reset_vcpu(CPUState *env) env->interrupt_injected = -1; env->nmi_injected = 0; env->nmi_pending = 0; + env->xcr0 = 1; if (kvm_irqchip_in_kernel()) { env->mp_state = cpu_is_bsp(env) ? KVM_MP_STATE_RUNNABLE : 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)); } } - /* Legal xcr0 for loading */ - env->xcr0 = 1; } #endif /* KVM_CAP_SET_GUEST_DEBUG */ |