---

yaml --- r: 356871 b: refs/heads/master c: 2f14324 h: refs/heads/master i: 356869: f8f703b 356867: 6ff36f3 356863: f7883c3 v: v3
git-mirror · Jan 24, 2013 · d1aa0a8 · d1aa0a8
1 parent 63ff64e
commit d1aa0a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;