summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-08-21 17:07:06 +0300
committerMarcelo Tosatti <mtosatti@redhat.com>2012-08-27 20:02:20 -0300
commit0afbe2f8781a812c7e501ec129eff45b21f792af (patch)
tree1b8013cd9c792f9c21b8a469b1fa043c48064e36
parenta5625189f6810ef79ced53989c794acfa10d3370 (diff)
downloadop-kernel-dev-0afbe2f8781a812c7e501ec129eff45b21f792af.zip
op-kernel-dev-0afbe2f8781a812c7e501ec129eff45b21f792af.tar.gz
KVM: x86 emulator: Fix #GP error code during linearization
We want the segment selector, nor segment number. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/emulate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 5b1c701..1451cff 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -725,9 +725,9 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
return X86EMUL_CONTINUE;
bad:
if (addr.seg == VCPU_SREG_SS)
- return emulate_ss(ctxt, addr.seg);
+ return emulate_ss(ctxt, sel);
else
- return emulate_gp(ctxt, addr.seg);
+ return emulate_gp(ctxt, sel);
}
static int linearize(struct x86_emulate_ctxt *ctxt,
OpenPOWER on IntegriCloud