---

yaml --- r: 329887 b: refs/heads/master c: ce56680 h: refs/heads/master i: 329885: fce9791 329883: 0015e2a 329879: 206abe4 329871: 874fec4 329855: abc1142 v: v3
git-mirror · Aug 27, 2012 · 09ce75b · 09ce75b
1 parent 1b3a20d
commit 09ce75b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1390a28b274e2e45f89bac67c435cbcbc5cc0790
+refs/heads/master: ce5668034752e52e995c8dc625337380099a088a
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -3216,6 +3216,7 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
 	vmcs_write32(sf->limit, var->limit);
 	vmcs_write16(sf->selector, var->selector);
 	if (vmx->rmode.vm86_active && var->s) {
+		vmx->rmode.segs[seg] = *var;
 		/*
 		 * Hack real-mode segments into vm86 compatibility.
 		 */