On Mon, 18 Jun 2018 16:36:00 +1000 David Gibson <da...@gibson.dropbear.id.au> wrote:
> spapr capabilities have an apply hook to actually activate (or deactivate) > the feature in the system at reset time. However, a number of capabilities > affect the setup of cpus, and need to be applied to each of them - > including hotplugged cpus for extra complication. To make this simpler, > add an optional cpu_apply hook that is called from spapr_cpu_reset(). > > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <gr...@kaod.org> > hw/ppc/spapr_caps.c | 19 +++++++++++++++++++ > hw/ppc/spapr_cpu_core.c | 2 ++ > include/hw/ppc/spapr.h | 1 + > 3 files changed, 22 insertions(+) > > diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c > index dabed817d1..68a4243efc 100644 > --- a/hw/ppc/spapr_caps.c > +++ b/hw/ppc/spapr_caps.c > @@ -59,6 +59,8 @@ typedef struct sPAPRCapabilityInfo { > sPAPRCapPossible *possible; > /* Make sure the virtual hardware can support this capability */ > void (*apply)(sPAPRMachineState *spapr, uint8_t val, Error **errp); > + void (*cpu_apply)(sPAPRMachineState *spapr, PowerPCCPU *cpu, > + uint8_t val, Error **errp); > } sPAPRCapabilityInfo; > > static void spapr_cap_get_bool(Object *obj, Visitor *v, const char *name, > @@ -472,6 +474,23 @@ void spapr_caps_apply(sPAPRMachineState *spapr) > } > } > > +void spapr_caps_cpu_apply(sPAPRMachineState *spapr, PowerPCCPU *cpu) > +{ > + int i; > + > + for (i = 0; i < SPAPR_CAP_NUM; i++) { > + sPAPRCapabilityInfo *info = &capability_table[i]; > + > + /* > + * If the apply function can't set the desired level and thinks it's > + * fatal, it should cause that. > + */ > + if (info->cpu_apply) { > + info->cpu_apply(spapr, cpu, spapr->eff.caps[i], &error_fatal); > + } > + } > +} > + > void spapr_caps_add_properties(sPAPRMachineClass *smc, Error **errp) > { > Error *local_err = NULL; > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index aef3be33a3..324623190d 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -76,6 +76,8 @@ static void spapr_cpu_reset(void *opaque) > spapr_cpu->slb_shadow_size = 0; > spapr_cpu->dtl_addr = 0; > spapr_cpu->dtl_size = 0; > + > + spapr_caps_cpu_apply(SPAPR_MACHINE(qdev_get_machine()), cpu); > } > > void spapr_cpu_set_entry_state(PowerPCCPU *cpu, target_ulong nip, > target_ulong r3) > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 9dbd6010f5..9dd46a72f6 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -800,6 +800,7 @@ static inline uint8_t spapr_get_cap(sPAPRMachineState > *spapr, int cap) > > void spapr_caps_init(sPAPRMachineState *spapr); > void spapr_caps_apply(sPAPRMachineState *spapr); > +void spapr_caps_cpu_apply(sPAPRMachineState *spapr, PowerPCCPU *cpu); > void spapr_caps_add_properties(sPAPRMachineClass *smc, Error **errp); > int spapr_caps_post_migration(sPAPRMachineState *spapr); >