[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/20] apic: Inject external NMI events via LINT1
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 06/20] apic: Inject external NMI events via LINT1 |
Date: |
Fri, 20 Jan 2012 15:26:32 -0200 |
From: Jan Kiszka <address@hidden>
On real hardware, NMI button events are injected via the LINT1 line of
the APICs. E.g. kdump expect this wiring and gets upset if the per-APIC
LINT1 mask is not respected, i.e. if NMIs are injected to VCPUs that
should not receive them. Change the APIC emulation code to reflect this.
Based on qemu-kvm patch by Lai Jiangshan.
CC: Lai Jiangshan <address@hidden>
Reported-by: Kenji Kaneshige <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
---
cpus.c | 6 +++++-
hw/apic.c | 7 +++++++
hw/apic.h | 1 +
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/cpus.c b/cpus.c
index 2dae549..f45a438 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1217,7 +1217,11 @@ void qmp_inject_nmi(Error **errp)
CPUState *env;
for (env = first_cpu; env != NULL; env = env->next_cpu) {
- cpu_interrupt(env, CPU_INTERRUPT_NMI);
+ if (!env->apic_state) {
+ cpu_interrupt(env, CPU_INTERRUPT_NMI);
+ } else {
+ apic_deliver_nmi(env->apic_state);
+ }
}
#else
error_set(errp, QERR_UNSUPPORTED);
diff --git a/hw/apic.c b/hw/apic.c
index 4b97b17..b9d733c 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -205,6 +205,13 @@ void apic_deliver_pic_intr(DeviceState *d, int level)
}
}
+void apic_deliver_nmi(DeviceState *d)
+{
+ APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
+
+ apic_local_deliver(s, APIC_LVT_LINT1);
+}
+
#define foreach_apic(apic, deliver_bitmask, code) \
{\
int __i, __j, __mask;\
diff --git a/hw/apic.h b/hw/apic.h
index a5c910f..a62d83b 100644
--- a/hw/apic.h
+++ b/hw/apic.h
@@ -8,6 +8,7 @@ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t
delivery_mode,
uint8_t vector_num, uint8_t trigger_mode);
int apic_accept_pic_intr(DeviceState *s);
void apic_deliver_pic_intr(DeviceState *s, int level);
+void apic_deliver_nmi(DeviceState *d);
int apic_get_interrupt(DeviceState *s);
void apic_reset_irq_delivered(void);
int apic_get_irq_delivered(void);
--
1.7.6.4
- [Qemu-devel] [PATCH 05/20] apic: Stop timer on reset, (continued)
- [Qemu-devel] [PATCH 05/20] apic: Stop timer on reset, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 15/20] kvm: Introduce core services for in-kernel irqchip support, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 16/20] kvm: x86: Establish IRQ0 override control, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 14/20] memory: Introduce memory_region_init_reservation, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 10/20] i8259: Completely privatize PicState, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 09/20] apic: Open-code timer save/restore, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 07/20] apic: Introduce apic_report_irq_delivered, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 04/20] kvm: Move kvmclock into hw/kvm folder, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 12/20] ioapic: Drop post-load irr initialization, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 20/20] kvm: Activate in-kernel irqchip support, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 06/20] apic: Inject external NMI events via LINT1,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 03/20] msi: Generalize msix_supported to msi_supported, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 17/20] kvm: x86: Add user space part for in-kernel APIC, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 01/20] hyper-v: introduce Hyper-V support infrastructure., Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 08/20] apic: Factor out base class for KVM reuse, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 11/20] i8259: Factor out base class for KVM reuse, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 19/20] kvm: x86: Add user space part for in-kernel IOAPIC, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 18/20] kvm: x86: Add user space part for in-kernel i8259, Marcelo Tosatti, 2012/01/20
- [Qemu-devel] [PATCH 13/20] ioapic: Factor out base class for KVM reuse, Marcelo Tosatti, 2012/01/20
- Re: [Qemu-devel] [PATCH 00/20] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2012/01/23