mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ppc: well form kvmppc_hint_smt_possible error hint helper"

Browse Source 
This reverts commit cdcca22aab.

Commit cdcca22aab is a superseded version of the next commit that
crept in by accident.  Revert it, so the final version applies.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-12-18 08:36:27 +01:00
parent 340773260b
commit 1a639fdf96
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

@ -2486,7 +2486,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_error_append_smt_possible_hint(&local_err); kvmppc_hint_smt_possible(&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_error_append_smt_possible_hint(Error **errp_in) void kvmppc_hint_smt_possible(Error **errp)
{ {
int i; int i;
GString *g; GString *g;
@ -2091,10 +2091,10 @@ void kvmppc_error_append_smt_possible_hint(Error **errp_in)
} }
} }
s = g_string_free(g, false); s = g_string_free(g, false);
error_append_hint(errp_in, "%s.\n", s); error_append_hint(errp, "%s.\n", s);
g_free(s); g_free(s);
} else { } else {
error_append_hint(errp_in, error_append_hint(errp,
"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_error_append_smt_possible_hint(Error **errp_in); void kvmppc_hint_smt_possible(Error **errp);
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_error_append_smt_possible_hint(Error **errp_in) static inline void kvmppc_hint_smt_possible(Error **errp)
{ {
return; return;
} }