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 kvmppc_error_append_*_hint.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
v6: keep kvmppc_ function prefix
add r-b by Marc-André
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..47b08a4030 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 kvmppc_error_append_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 kvmppc_error_append_smt_possible_hint(Error **errp_in)
{
return;
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index e076f6023c..1b87eb0ffd 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2564,7 +2564,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);
+ kvmppc_error_append_smt_possible_hint(&local_err);
goto out;
}
}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index c77f9848ec..7406d18945 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 kvmppc_error_append_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
On Wed, 27 Nov 2019 22:14:34 +0300 Vladimir Sementsov-Ogievskiy <vsementsov@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 kvmppc_error_append_*_hint. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > Reviewed-by: Greg Kurz <groug@kaod.org> > v6: keep kvmppc_ function prefix > add r-b by Marc-André > > 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..47b08a4030 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 kvmppc_error_append_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 kvmppc_error_append_smt_possible_hint(Error **errp_in) > { > return; > } > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index e076f6023c..1b87eb0ffd 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2564,7 +2564,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); > + kvmppc_error_append_smt_possible_hint(&local_err); > goto out; > } > } > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index c77f9848ec..7406d18945 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 kvmppc_error_append_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"); > } > }
On Wed, Nov 27, 2019 at 10:14:34PM +0300, Vladimir Sementsov-Ogievskiy 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 kvmppc_error_append_*_hint. I'm not entirely convinced by the errp_in name, since it's actually both an in and out parameter. Nonetheless, I've applied this to ppc-for-5.0. > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > > v6: keep kvmppc_ function prefix > add r-b by Marc-André > > 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..47b08a4030 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 kvmppc_error_append_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 kvmppc_error_append_smt_possible_hint(Error **errp_in) > { > return; > } > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index e076f6023c..1b87eb0ffd 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2564,7 +2564,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); > + kvmppc_error_append_smt_possible_hint(&local_err); > goto out; > } > } > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index c77f9848ec..7406d18945 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 kvmppc_error_append_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"); > } > } -- 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
02.12.2019 5:39, David Gibson wrote: > On Wed, Nov 27, 2019 at 10:14:34PM +0300, Vladimir Sementsov-Ogievskiy 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 kvmppc_error_append_*_hint. > > I'm not entirely convinced by the errp_in name, since it's actually > both an in and out parameter. Nonetheless, I've applied this to > ppc-for-5.0. Markus doesn't like it too. So, seems there would be v7, the current version is here: git://repo.or.cz/qemu/armbru.git branch error-prep Discussion is here: https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg04633.html and here: https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg04636.html Sorry, for sent v6 in separate :\ > > >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> >> --- >> >> v6: keep kvmppc_ function prefix >> add r-b by Marc-André >> >> 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..47b08a4030 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 kvmppc_error_append_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 kvmppc_error_append_smt_possible_hint(Error **errp_in) >> { >> return; >> } >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index e076f6023c..1b87eb0ffd 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -2564,7 +2564,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); >> + kvmppc_error_append_smt_possible_hint(&local_err); >> goto out; >> } >> } >> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c >> index c77f9848ec..7406d18945 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 kvmppc_error_append_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"); >> } >> } > -- Best regards, Vladimir
© 2016 - 2024 Red Hat, Inc.