[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/17] kvm: x86: Fix xcr0 reset mismerge
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 09/17] kvm: x86: Fix xcr0 reset mismerge |
Date: |
Mon, 3 Jan 2011 09:32:59 +0100 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
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 1403327..e46b901 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;
@@ -1756,8 +1757,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 */
--
1.7.1
- [Qemu-devel] [PATCH v2 00/17] [uq/master] Prepare for more qemu-kvm merging, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 08/17] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 09/17] kvm: x86: Fix xcr0 reset mismerge,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 01/17] kvm: Fix coding style violations, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 05/17] x86: Optionally dump code bytes on cpu_dump_state, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 14/17] kvm: x86: Introduce kvmclock device to save/restore its state, Jan Kiszka, 2011/01/03
- [Qemu-devel] Re: [PATCH v2 14/17] kvm: x86: Introduce kvmclock device to save/restore its state, Glauber Costa, 2011/01/03