From 6a0b681fc82b33c369d708412889209aa970f5b5 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 8 Feb 2012 14:34:39 +0100 Subject: [PATCH] --- yaml --- r: 297159 b: refs/heads/master c: 66b0ab8fac1031ffc70eb77491048339f2717a54 h: refs/heads/master i: 297157: 1458c6c11101feb4c71d008ecb64e51990830fa7 297155: 3b919487320a3412f7b0683364c29098c4211437 297151: 622af671894ac83cd50c5891e032835ab3d34493 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/emulate.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3f8474e3efac..4180ffcab893 100644 --- 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 index fa310a48591c..b19e9fffe582 100644 --- 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; }