From 229d17d711daf47a45777841037295b3d3185f36 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Thu, 7 Jun 2012 17:06:10 +0300
Subject: [PATCH] --- yaml --- r: 315876 b: refs/heads/master c:
 f0495f9b9992f80f82b14306946444b287193390 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2d298c55999..f1e33bd441c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 510425ff3344df03a1f94bce49e659ae302e0d34
+refs/heads/master: f0495f9b9992f80f82b14306946444b287193390
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 486db2f9561b..82ab1fb2683e 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -3198,7 +3198,7 @@ static u32 vmx_segment_access_rights(struct kvm_segment *var)
 {
 	u32 ar;
 
-	if (var->unusable)
+	if (var->unusable || !var->present)
 		ar = 1 << 16;
 	else {
 		ar = var->type & 15;
@@ -3210,8 +3210,6 @@ static u32 vmx_segment_access_rights(struct kvm_segment *var)
 		ar |= (var->db & 1) << 14;
 		ar |= (var->g & 1) << 15;
 	}
-	if (ar == 0) /* a 0 value means unusable */
-		ar = AR_UNUSABLE_MASK;
 
 	return ar;
 }