From dacce5efce3492a13815a6652a95e3bf116afee1 Mon Sep 17 00:00:00 2001
From: Dor Laor <dor.laor@qumranet.com>
Date: Fri, 5 Jan 2007 16:37:00 -0800
Subject: [PATCH] --- yaml --- r: 45295 b: refs/heads/master c:
 022a93080c269e913793bea3a9a7fed06ca7d29b h: refs/heads/master i:   45293:
 020be4626281b084eed17894c94c405fe45c9646   45291:
 60269bd3d8e95cb6f01948f9f34b65de3495acd8   45287:
 53183e0440fd10fb3c383515da7943cf805acd73   45279:
 9fd85dd9972d71f89447094fd9618b848a918c21 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/svm.c | 3 +--
 trunk/drivers/kvm/vmx.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index af444c11d410..cc7739cd2f4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a99f6d37aa65e848e09ec6ea52848e93bd5de2
+refs/heads/master: 022a93080c269e913793bea3a9a7fed06ca7d29b
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index af1e7b3f9171..ccc06b1b91b5 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -1206,8 +1206,7 @@ static int interrupt_window_interception(struct kvm_vcpu *vcpu,
 	 * possible
 	 */
 	if (kvm_run->request_interrupt_window &&
-	    !vcpu->irq_summary &&
-	    (vcpu->svm->vmcb->save.rflags & X86_EFLAGS_IF)) {
+	    !vcpu->irq_summary) {
 		++kvm_stat.irq_window_exits;
 		kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
 		return 0;
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index e6ea76cdfdbd..d4701cb4c654 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -1604,8 +1604,7 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu,
 	 * possible
 	 */
 	if (kvm_run->request_interrupt_window &&
-	    !vcpu->irq_summary &&
-	    (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF)) {
+	    !vcpu->irq_summary) {
 		kvm_run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;
 		++kvm_stat.irq_window_exits;
 		return 0;