| Message ID | 20200316142613.121089-6-npiggin@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | FWNMI fixes / changes | expand |
On 3/16/20 3:26 PM, Nicholas Piggin wrote: > 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> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/ppc/spapr_caps.c | 5 +---- > 1 file changed, 1 insertion(+), 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"); >
On Tue, 17 Mar 2020 00:26:10 +1000 Nicholas Piggin <npiggin@gmail.com> wrote: > 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> > --- > hw/ppc/spapr_caps.c | 5 +---- > 1 file changed, 1 insertion(+), 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"); With this warning removed, we can now drop the "cap-fwnmi=off" setting in qtest, but this can be done as a followup. Reviewed-by: Greg Kurz <groug@kaod.org> > - } 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");
Greg Kurz's on March 17, 2020 4:01 am: > On Tue, 17 Mar 2020 00:26:10 +1000 > Nicholas Piggin <npiggin@gmail.com> wrote: > >> 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> >> --- >> hw/ppc/spapr_caps.c | 5 +---- >> 1 file changed, 1 insertion(+), 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"); > > With this warning removed, we can now drop the "cap-fwnmi=off" setting > in qtest, but this can be done as a followup. Ah right, thanks. Would you send the patch later or should I? Thanks, Nick
On Tue, Mar 17, 2020 at 09:26:15AM +1000, Nicholas Piggin wrote: > Greg Kurz's on March 17, 2020 4:01 am: > > On Tue, 17 Mar 2020 00:26:10 +1000 > > Nicholas Piggin <npiggin@gmail.com> wrote: > > > >> 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> > >> --- > >> hw/ppc/spapr_caps.c | 5 +---- > >> 1 file changed, 1 insertion(+), 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"); > > > > With this warning removed, we can now drop the "cap-fwnmi=off" setting > > in qtest, but this can be done as a followup. > > Ah right, thanks. Would you send the patch later or should I? No need, I already folded the change into your patch. > > Thanks, > Nick >
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");
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> --- hw/ppc/spapr_caps.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)