[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/31] kvm: x86: Fix xcr0 reset mismerge
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 21/31] kvm: x86: Fix xcr0 reset mismerge |
Date: |
Mon, 24 Jan 2011 07:02:30 -0200 |
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>
Signed-off-by: Marcelo Tosatti <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.2.3
- [Qemu-devel] [PATCH 04/31] Add "broadcast" option for mce command, (continued)
- [Qemu-devel] [PATCH 04/31] Add "broadcast" option for mce command, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 01/31] kvm: Enable user space NMI injection for kvm guest, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 07/31] kvm: kvm_mce_inj_* subroutines for templated error injections, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 13/31] kvm: Fix coding style violations, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 08/31] kvm: introduce kvm_inject_x86_mce_on, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 14/31] kvm: x86: Swallow KVM_EXIT_SET_TPR, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 09/31] kvm: x86: Fix DPL write back of segment registers, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 29/31] kvm: Do not use qemu_fair_mutex, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 18/31] kvm: x86: Align kvm_arch_put_registers code with comment, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 10/31] kvm: x86: Remove obsolete SS.RPL/DPL aligment, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 21/31] kvm: x86: Fix xcr0 reset mismerge,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 20/31] kvm: x86: Remove redundant mp_state initialization, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 23/31] kvm: x86: Reset paravirtual MSRs, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 27/31] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 25/31] kvm: Drop smp_cpus argument from init functions, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 16/31] kvm: Improve reporting of fatal errors, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 06/31] kvm: introduce kvm_mce_in_progress, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 12/31] kvm: x86: Fix a few coding style violations, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 26/31] kvm: Consolidate must-have capability checks, Marcelo Tosatti, 2011/01/24