summaryrefslogtreecommitdiffstats
path: root/hw/ppc/spapr_caps.c
diff options
context:
space:
mode:
authorNicholas Piggin2020-03-16 15:26:10 +0100
committerDavid Gibson2020-03-17 07:00:22 +0100
commit89ba45652b0ce41e96ebf7108cfca0906201a967 (patch)
tree2fa9bdc56678c33b4d6db6e64069fe35e4460740 /hw/ppc/spapr_caps.c
parentppc/spapr: Fix FWNMI machine check interrupt delivery (diff)
downloadqemu-89ba45652b0ce41e96ebf7108cfca0906201a967.tar.gz
qemu-89ba45652b0ce41e96ebf7108cfca0906201a967.tar.xz
qemu-89ba45652b0ce41e96ebf7108cfca0906201a967.zip
ppc/spapr: Allow FWNMI on TCG
There should no longer be a reason to prevent TCG providing FWNMI. System Reset interrupts are generated to the guest with nmi monitor command and H_SIGNAL_SYS_RESET. Machine Checks can not be injected currently, but this could be implemented with the mce monitor cmd similarly to i386. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Message-Id: <20200316142613.121089-6-npiggin@gmail.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Greg Kurz <groug@kaod.org> [dwg: Re-enable FWNMI in qtests, since that now works] Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/spapr_caps.c')
-rw-r--r--hw/ppc/spapr_caps.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index f626d769a0..679ae7959f 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -516,10 +516,7 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val,
return; /* Disabled by default */
}
- if (tcg_enabled()) {
- warn_report("Firmware Assisted Non-Maskable Interrupts(FWNMI) not "
- "supported in TCG");
- } else if (kvm_enabled()) {
+ if (kvm_enabled()) {
if (kvmppc_set_fwnmi() < 0) {
error_setg(errp, "Firmware Assisted Non-Maskable Interrupts(FWNMI) "
"not supported by KVM");