From: Avi Kivity <avi@qumranet.com>
Date: Mon, 16 Jun 2008 05:45:54 +0000 (-0700)
Subject: KVM: x86 emulator: avoid segment base adjust for lea
X-Git-Tag: v2.6.27-rc1~968^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0adc8675d645940139d12477e5e05b8a0a7a1117;p=linux-2.6-omap-h63xx.git

KVM: x86 emulator: avoid segment base adjust for lea

Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 20b604489c3..38926b7da64 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -940,7 +940,7 @@ done_prefixes:
 	    c->override_base != &ctxt->gs_base)
 		c->override_base = NULL;
 
-	if (c->override_base)
+	if (c->override_base && !(!c->twobyte && c->b == 0x8d))
 		c->modrm_ea += *c->override_base;
 
 	if (c->ad_bytes != 8)