diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2020-03-17 00:26:10 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2020-03-17 17:00:22 +1100 |
| commit | 89ba45652b0ce41e96ebf7108cfca0906201a967 (patch) | |
| tree | 2fa9bdc56678c33b4d6db6e64069fe35e4460740 | |
| parent | ad77c6ca0c63e39eb6ded9c1a761eaa16b21b7f9 (diff) | |
| download | focaccia-qemu-89ba45652b0ce41e96ebf7108cfca0906201a967.tar.gz focaccia-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>
| -rw-r--r-- | hw/ppc/spapr_caps.c | 5 | ||||
| -rw-r--r-- | tests/qtest/libqos/libqos-spapr.h | 3 |
2 files changed, 2 insertions, 6 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"); diff --git a/tests/qtest/libqos/libqos-spapr.h b/tests/qtest/libqos/libqos-spapr.h index 16174dbada..49bd72d20b 100644 --- a/tests/qtest/libqos/libqos-spapr.h +++ b/tests/qtest/libqos/libqos-spapr.h @@ -12,7 +12,6 @@ void qtest_spapr_shutdown(QOSState *qs); "cap-cfpc=broken," \ "cap-sbbc=broken," \ "cap-ibs=broken," \ - "cap-ccf-assist=off," \ - "cap-fwnmi=off" + "cap-ccf-assist=off," #endif |