diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-12-18 08:36:27 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-12-18 08:40:09 +0100 |
| commit | 1a639fdf960393d91d96bb938e1c08a5de41fd76 (patch) | |
| tree | 43adec56be9aa2d28889e6be22e0f15fb7dc7c15 /target | |
| parent | 340773260bfaff4e8b0c1a8ec6f22d8b078f590b (diff) | |
| download | qemu-1a639fdf960393d91d96bb938e1c08a5de41fd76.zip qemu-1a639fdf960393d91d96bb938e1c08a5de41fd76.tar.gz qemu-1a639fdf960393d91d96bb938e1c08a5de41fd76.tar.bz2 | |
Revert "ppc: well form kvmppc_hint_smt_possible error hint helper"
This reverts commit cdcca22aabafc0496894ce05c80097684832c7d9.
Commit cdcca22aaba 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>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/kvm.c | 6 | ||||
| -rw-r--r-- | target/ppc/kvm_ppc.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 7406d18..c77f984 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_error_append_smt_possible_hint(Error **errp_in) +void kvmppc_hint_smt_possible(Error **errp) { int i; GString *g; @@ -2091,10 +2091,10 @@ void kvmppc_error_append_smt_possible_hint(Error **errp_in) } } s = g_string_free(g, false); - error_append_hint(errp_in, "%s.\n", s); + error_append_hint(errp, "%s.\n", s); g_free(s); } else { - error_append_hint(errp_in, + error_append_hint(errp, "This KVM seems to be too old to support VSMT.\n"); } } diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 47b08a4..98bd7d5 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_error_append_smt_possible_hint(Error **errp_in); +void kvmppc_hint_smt_possible(Error **errp); 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_error_append_smt_possible_hint(Error **errp_in) +static inline void kvmppc_hint_smt_possible(Error **errp) { return; } |