* [PATCH] KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip
@ 2008-11-24 11:26 Jan Kiszka
2008-12-10 10:51 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2008-11-24 11:26 UTC (permalink / raw)
To: kvm-devel; +Cc: Avi Kivity, Yang, Sheng
Push b55a50582030cf294a675492d7ab2e235b965cc8 and
d3a2c20c9b850d92dae383fd6a64840de2687cd6 also to the user space irqchip
path.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
arch/x86/kvm/vmx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 7ea4855..775a140 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2486,7 +2486,9 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu,
vmx_update_window_states(vcpu);
if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) {
- if (vcpu->arch.nmi_window_open) {
+ if (vcpu->arch.interrupt.pending) {
+ enable_nmi_window(vcpu);
+ } else if (vcpu->arch.nmi_window_open) {
vcpu->arch.nmi_pending = false;
vcpu->arch.nmi_injected = true;
} else {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip
2008-11-24 11:26 [PATCH] KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip Jan Kiszka
@ 2008-12-10 10:51 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2008-12-10 10:51 UTC (permalink / raw)
To: Jan Kiszka; +Cc: kvm-devel, Yang, Sheng
Jan Kiszka wrote:
> Push b55a50582030cf294a675492d7ab2e235b965cc8 and
> d3a2c20c9b850d92dae383fd6a64840de2687cd6 also to the user space irqchip
> path.
>
>
Applied (belatedly...), thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-10 10:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-24 11:26 [PATCH] KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip Jan Kiszka
2008-12-10 10:51 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).