---

yaml --- r: 297159 b: refs/heads/master c: 66b0ab8 h: refs/heads/master i: 297157: 1458c6c 297155: 3b91948 297151: 622af67 v: v3
git-mirror · Mar 8, 2012 · 6a0b681 · 6a0b681
1 parent 31fbd29
commit 6a0b681
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f3d35fddd173e52886d03bc34b5b5d6f5bea343
+refs/heads/master: 66b0ab8fac1031ffc70eb77491048339f2717a54
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -1244,6 +1244,8 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
 		seg_desc.type = 3;
 		seg_desc.p = 1;
 		seg_desc.s = 1;
+		if (ctxt->mode == X86EMUL_MODE_VM86)
+			seg_desc.dpl = 3;
 		goto load;
 	}