On Fri, Oct 11, 2019 at 8:14 PM Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> wrote: > > Make kvmppc_hint_smt_possible hint append helper well formed: > rename errp to errp_in, as it is IN-parameter here (which is unusual > for errp), rename function to be error_append_*_hint. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > target/ppc/kvm_ppc.h | 4 ++-- > hw/ppc/spapr.c | 2 +- > target/ppc/kvm.c | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h > index 98bd7d5da6..35f1d499ad 100644 > --- a/target/ppc/kvm_ppc.h > +++ b/target/ppc/kvm_ppc.h > @@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu); > int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); > void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); > int kvmppc_smt_threads(void); > -void kvmppc_hint_smt_possible(Error **errp); > +void error_append_kvmppc_smt_possible_hint(Error **errp_in); > int kvmppc_set_smt_threads(int smt); > int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); > int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); > @@ -164,7 +164,7 @@ static inline int kvmppc_smt_threads(void) > return 1; > } > > -static inline void kvmppc_hint_smt_possible(Error **errp) > +static inline void error_append_kvmppc_smt_possible_hint(Error **errp_in)
Please keep the kvmppc_ prefix other than that: Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> > { > return; > } > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 514a17ae74..6729269aa9 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2565,7 +2565,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState > *spapr, Error **errp) > " requires the use of VSMT mode %d.\n", > smp_threads, kvm_smt, spapr->vsmt); > } > - kvmppc_hint_smt_possible(&local_err); > + error_append_kvmppc_smt_possible_hint(&local_err); > goto out; > } > } > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 820724cc7d..af6e667bf8 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt) > return ret; > } > > -void kvmppc_hint_smt_possible(Error **errp) > +void error_append_kvmppc_smt_possible_hint(Error **errp_in) > { > int i; > GString *g; > @@ -2091,10 +2091,10 @@ void kvmppc_hint_smt_possible(Error **errp) > } > } > s = g_string_free(g, false); > - error_append_hint(errp, "%s.\n", s); > + error_append_hint(errp_in, "%s.\n", s); > g_free(s); > } else { > - error_append_hint(errp, > + error_append_hint(errp_in, > "This KVM seems to be too old to support VSMT.\n"); > } > } > -- > 2.21.0 > > -- Marc-André Lureau