ppc: well form kvmppc_hint_smt_possible error hint helper
PATCH v6 1/1 ppc: well form kvmppc_hint_smt_possible error hint helper
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.
---
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(-)
target/ppc/kvm_ppc.h +2 -2
@@ -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 ; }
hw/ppc/spapr.c +1 -1
@@ -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; } }
target/ppc/kvm.c +3 -3
@@ -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" ); } }
Signature · 1 line
2.21.0
Quoted 8 lines · On Wed, 27 Nov 2019 22:14:34 +0300 Vladimir Sementsov-Ogievskiy…
Make
kvmppc_hint_smt_possiblehint append helper well formed:
rename errp toerrp_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 <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>---
Quoted 69 lines
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(-)target/ppc/kvm_ppc.h +2
-2@@ -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 ; }hw/ppc/spapr.c +1
-1@@ -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; } }target/ppc/kvm.c +3
-3@@ -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" ); } }
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
Make
kvmppc_hint_smt_possiblehint append helper well formed:
rename errp toerrp_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.
Quoted 73 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>---
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(-)target/ppc/kvm_ppc.h +2
-2@@ -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 ; }hw/ppc/spapr.c +1
-1@@ -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; } }target/ppc/kvm.c +3
-3@@ -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" ); } }
Signature · 4 lines
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
Quoted 8 lines · David Gibson
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
Make
kvmppc_hint_smt_possiblehint append helper well formed:
rename errp toerrp_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_inname, 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 :\
Quoted 76 lines
Quoted 75 lines
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>---
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(-)target/ppc/kvm_ppc.h +2
-2@@ -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 ; }hw/ppc/spapr.c +1
-1@@ -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; } }target/ppc/kvm.c +3
-3@@ -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" ); } }
Signature · 2 lines
Best regards, Vladimir