The SpaprMachineClass::smp_threads_vsmt field was only used by the pseries-4.1 machine, which got removed. Remove it as now unused.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/ppc/spapr.h | 1 - hw/ppc/spapr.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 82f556f97e1..1629baf12ac 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -144,7 +144,6 @@ struct SpaprMachineClass { /*< public >*/ bool linux_pci_probe; - bool smp_threads_vsmt; /* set VSMT to smp_threads by default */ hwaddr rma_limit; /* clamp the RMA to this size */ bool pre_5_1_assoc_refpoints; bool pre_5_2_numa_associativity; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 546e100c9cd..c8558e47db2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2588,7 +2588,6 @@ static CPUArchId *spapr_find_cpu_slot(MachineState *ms, uint32_t id, int *idx) static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp) { MachineState *ms = MACHINE(spapr); - SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr); Error *local_err = NULL; bool vsmt_user = !!spapr->vsmt; int kvm_smt = kvmppc_smt_threads(); @@ -2624,15 +2623,6 @@ static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp) return; } /* In this case, spapr->vsmt has been set by the command line */ - } else if (!smc->smp_threads_vsmt) { - /* - * Default VSMT value is tricky, because we need it to be as - * consistent as possible (for migration), but this requires - * changing it for at least some existing cases. We pick 8 as - * the value that we'd get with KVM on POWER8, the - * overwhelmingly common case in production systems. - */ - spapr->vsmt = MAX(8, smp_threads); } else { spapr->vsmt = smp_threads; } @@ -4649,7 +4639,6 @@ static void spapr_machine_class_init(ObjectClass *oc, const void *data) spapr_caps_add_properties(smc); smc->irq = &spapr_irq_dual; smc->linux_pci_probe = true; - smc->smp_threads_vsmt = true; xfc->match_nvt = spapr_match_nvt; vmc->client_architecture_support = spapr_vof_client_architecture_support; vmc->quiesce = spapr_vof_quiesce; -- 2.51.0
