From 45643421891e1a5fde6daa7ad5f1277206be7817 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Mon, 21 Jan 2013 15:36:46 +0200 Subject: [PATCH] --- yaml --- r: 356875 b: refs/heads/master c: 25391454e73e3156202264eb3c473825afe4bc94 h: refs/heads/master i: 356873: 68d9f8fc26810765a3a5373142675ff8428ab15c 356871: d1aa0a8fcb7435c89e716927f7127e5fd254c3e3 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bbffaf514105..00b3d1f12e1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 218e763f458c44f30041c1b48b4371e130fd4317 +refs/heads/master: 25391454e73e3156202264eb3c473825afe4bc94 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 319e840e2ada..77212d1e1df9 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3196,8 +3196,6 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu, var->limit = vmx_read_guest_seg_limit(vmx, seg); var->selector = vmx_read_guest_seg_selector(vmx, seg); ar = vmx_read_guest_seg_ar(vmx, seg); - if ((ar & AR_UNUSABLE_MASK) && !emulate_invalid_guest_state) - ar = 0; var->type = ar & 15; var->s = (ar >> 4) & 1; var->dpl = (ar >> 5) & 3;