[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/18] kvm: x86: Fix xcr0 reset mismerge
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 08/18] kvm: x86: Fix xcr0 reset mismerge |
Date: |
Fri, 21 Jan 2011 21:48:12 +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 07c75c0..c4a22dd 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 */
--
1.7.1
- [Qemu-devel] [PATCH 05/18] kvm: x86: Align kvm_arch_put_registers code with comment, (continued)
- [Qemu-devel] [PATCH 05/18] kvm: x86: Align kvm_arch_put_registers code with comment, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 03/18] kvm: Improve reporting of fatal errors, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 10/18] kvm: x86: Reset paravirtual MSRs, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 01/18] kvm: x86: Swallow KVM_EXIT_SET_TPR, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 07/18] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_state, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 11/18] kvm: x86: Fix !CONFIG_KVM_PARA build, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 02/18] kvm: Stop on all fatal exit reasons, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 12/18] kvm: Drop smp_cpus argument from init functions, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 14/18] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 08/18] kvm: x86: Fix xcr0 reset mismerge,
Jan Kiszka <=
- [Qemu-devel] [PATCH 09/18] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Jan Kiszka, 2011/01/21