On Fri, 17 Jan 2020 15:08:55 +0530 Ganesh Goudar <ganes...@linux.ibm.com> wrote:
> From: Aravinda Prasad <arawind...@gmail.com> > > This patch sets the default value of SPAPR_CAP_FWNMI_MCE > to SPAPR_CAP_ON for machine type 4.2. > Now that 4.2 has been released, we want this for 5.0... > Signed-off-by: Aravinda Prasad <arawind...@gmail.com> > Signed-off-by: Ganesh Goudar <ganes...@linux.ibm.com> > --- > hw/ppc/spapr.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index c8bc2fa9f3..a81c18b6b6 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4454,7 +4454,7 @@ static void spapr_machine_class_init(ObjectClass *oc, > void *data) > smc->default_caps.caps[SPAPR_CAP_NESTED_KVM_HV] = SPAPR_CAP_OFF; > smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON; > smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_OFF; > - smc->default_caps.caps[SPAPR_CAP_FWNMI_MCE] = SPAPR_CAP_OFF; > + smc->default_caps.caps[SPAPR_CAP_FWNMI_MCE] = SPAPR_CAP_ON; > spapr_caps_add_properties(smc, &error_abort); > smc->irq = &spapr_irq_dual; > smc->dr_phb_enabled = true; > @@ -4544,6 +4544,7 @@ static void > spapr_machine_4_1_class_options(MachineClass *mc) > smc->smp_threads_vsmt = false; > compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > + smc->default_caps.caps[SPAPR_CAP_FWNMI_MCE] = SPAPR_CAP_OFF; ... this should go to spapr_machine_4_2_class_options(). > } > > DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
