From: Joerg Roedel <joerg.roedel@amd.com>
Date: Fri, 7 Aug 2009 09:49:47 +0000 (+0200)
Subject: KVM: SVM: check for nested VINTR flag in svm_interrupt_allowed
X-Git-Tag: v2.6.32-rc1~693^2~30
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=108768de55949c778bd95b36f3b17e652e59cd5b;p=~emulex%2Finfiniband.git

KVM: SVM: check for nested VINTR flag in svm_interrupt_allowed

Not checking for this flag breaks any nested hypervisor that does not
set VINTR. So fix it with this patch.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 144f2025799..6610f60b4c9 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2463,7 +2463,7 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)
 	return (vmcb->save.rflags & X86_EFLAGS_IF) &&
 		!(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) &&
 		gif_set(svm) &&
-		!is_nested(svm);
+		!(is_nested(svm) && (svm->vcpu.arch.hflags & HF_VINTR_MASK));
 }
 
 static void enable_irq_window(struct kvm_vcpu *vcpu)