ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20191127191434.20945-1-vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-11-27 22:14:34 +03:00 committed by David Gibson
parent d302e00080
commit cdcca22aab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ppc/spapr.c
View File

@ -2564,7 +2564,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp)
" requires the use of VSMT mode %d.\n", " requires the use of VSMT mode %d.\n",
smp_threads, kvm_smt, spapr->vsmt); smp_threads, kvm_smt, spapr->vsmt);
} }
kvmppc_hint_smt_possible(&local_err); kvmppc_error_append_smt_possible_hint(&local_err);
goto out; goto out;
} }
} }

6
target/ppc/kvm.c
View File

@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt)
return ret; return ret;
} }
void kvmppc_hint_smt_possible(Error **errp) void kvmppc_error_append_smt_possible_hint(Error **errp_in)
{ {
int i; int i;
GString *g; GString *g;
@ -2091,10 +2091,10 @@ void kvmppc_hint_smt_possible(Error **errp)
} }
} }
s = g_string_free(g, false); s = g_string_free(g, false);
error_append_hint(errp, "%s.\n", s); error_append_hint(errp_in, "%s.\n", s);
g_free(s); g_free(s);
} else { } else {
error_append_hint(errp, error_append_hint(errp_in,
"This KVM seems to be too old to support VSMT.\n"); "This KVM seems to be too old to support VSMT.\n");
} }
} }

4
target/ppc/kvm_ppc.h
View File

@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu);
int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
int kvmppc_smt_threads(void); 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_set_smt_threads(int smt);
int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits); int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
int kvmppc_or_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; return 1;
} }
static inline void kvmppc_hint_smt_possible(Error **errp) static inline void kvmppc_error_append_smt_possible_hint(Error **errp_in)
{ {
return; return;
} }