Re: [RFC PATCH 12/13] ppc/spapr: Allow FWNMI on TCG

[David Gibson]

On Wed, Mar 04, 2020 at 03:28:49PM +1000, 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.

Ok, I'd prefer to move the fixes for TCG handling earlier in the
series, rather than having a window where TCG won't start without
extra options or behaves silently differently to KVM.

> 
> Signed-off-by: Nicholas Piggin <address@hidden>
> ---
>  hw/ppc/spapr_caps.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index d3465871a4..f8583c6b44 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()) {
> -        error_setg(errp, "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, "
> @@ -646,9 +643,7 @@ static SpaprCapabilities 
> default_caps_with_cpu(SpaprMachineState *spapr,
>  
>      caps = smc->default_caps;
>  
> -    if (tcg_enabled()) {
> -        caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF;
> -    } else if (kvm_enabled()) {
> +    if (kvm_enabled()) {
>          if (!kvmppc_get_fwnmi()) {
>              caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_OFF;
>          }

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature