From fce979170e4694cce0b315fe95cd9c45bbba5438 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 21 Aug 2012 17:07:07 +0300 Subject: [PATCH] --- yaml --- r: 329885 b: refs/heads/master c: 726364202853f843a97a8ba4a7c3cd91e3aa84b7 h: refs/heads/master i: 329883: 0015e2af1f13b17ffeadf2e8e784afd2020ad8eb v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5225af0f84d1..f64b9724bb40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0afbe2f8781a812c7e501ec129eff45b21f792af +refs/heads/master: 726364202853f843a97a8ba4a7c3cd91e3aa84b7 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index fd21eb454663..0d6872621ab5 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3108,8 +3108,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu, if (vmx->rmode.vm86_active && (seg == VCPU_SREG_TR || seg == VCPU_SREG_ES || seg == VCPU_SREG_DS || seg == VCPU_SREG_FS - || seg == VCPU_SREG_GS) - && !emulate_invalid_guest_state) { + || seg == VCPU_SREG_GS)) { *var = vmx->rmode.segs[seg]; if (seg == VCPU_SREG_TR || var->selector == vmx_read_guest_seg_selector(vmx, seg))