From d1aa0a8fcb7435c89e716927f7127e5fd254c3e3 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Mon, 21 Jan 2013 15:36:42 +0200 Subject: [PATCH] --- yaml --- r: 356871 b: refs/heads/master c: 2f143240cb822c0d23ad591b89fe10e7c1f842f5 h: refs/heads/master i: 356869: f8f703b48f03366b71fa6a75595be004ccc5f34a 356867: 6ff36f33562e912e32c3f5ac46cc30a56b83b1df 356863: f7883c324d437de13616fec65ba78e83e4483867 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6493953de6d0..022508b7ca4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f3141e80b149e7215313dff29e9a0c47811b1d1 +refs/heads/master: 2f143240cb822c0d23ad591b89fe10e7c1f842f5 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 9d2ec88eeed2..edfbe94c622c 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3269,7 +3269,8 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg]; vmx_segment_cache_clear(vmx); - __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail); + if (seg == VCPU_SREG_CS) + __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail); if (vmx->rmode.vm86_active && seg != VCPU_SREG_LDTR) { vmx->rmode.segs[seg] = *var;