From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org, Gleb Natapov <gleb@redhat.com>
Subject: [PATCH 02/10] Do not allow interrupt injection from userspace if there is a pending event.
Date: Mon, 11 May 2009 13:35:47 +0300 [thread overview]
Message-ID: <1242038155-8759-2-git-send-email-gleb@redhat.com> (raw)
In-Reply-To: <1242038155-8759-1-git-send-email-gleb@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
arch/x86/kvm/x86.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c6d3ff3..fe447e7 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3093,8 +3093,9 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu,
kvm_run->ready_for_interrupt_injection = 1;
else
kvm_run->ready_for_interrupt_injection =
- (kvm_arch_interrupt_allowed(vcpu) &&
- !kvm_cpu_has_interrupt(vcpu));
+ kvm_arch_interrupt_allowed(vcpu) &&
+ !kvm_cpu_has_interrupt(vcpu) &&
+ !kvm_event_needs_reinjection(vcpu);
}
static void vapic_enter(struct kvm_vcpu *vcpu)
--
1.6.2.1
next prev parent reply other threads:[~2009-05-11 10:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 10:35 [PATCH 01/10] Unprotect a page if #PF happens during NMI injection Gleb Natapov
2009-05-11 10:35 ` Gleb Natapov [this message]
2009-05-11 10:35 ` [PATCH 03/10] Remove irq_pending bitmap Gleb Natapov
2009-05-11 10:35 ` [PATCH 04/10] [SVM] skip_emulated_instruction() decode an instruction if size is not known Gleb Natapov
2009-05-11 10:35 ` [PATCH 05/10] [VMX] Do not re-execute INTn instruction Gleb Natapov
2009-05-11 10:35 ` [PATCH 06/10] IRQ/NMI window should always be requested Gleb Natapov
2009-05-11 10:35 ` [PATCH 07/10] [SVM] inject NMI after IRET from a previous NMI, not before Gleb Natapov
2009-05-11 10:35 ` [PATCH 08/10] Do not migrate pending software interrupts Gleb Natapov
2009-05-11 10:35 ` [PATCH 09/10] Disable CR8 intercept if tpr patching is active Gleb Natapov
2009-05-11 10:35 ` [PATCH 10/10] Move "exit due to NMI" handling into vmx_complete_interrupts() Gleb Natapov
2009-05-13 12:07 ` [PATCH 01/10] Unprotect a page if #PF happens during NMI injection Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1242038155-8759-2-git-send-email-gleb@redhat.com \
--to=gleb@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox