[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 20/35] Revert "ppc: well form kvmppc_hint_smt_possible error hi
From: |
Markus Armbruster |
Subject: |
[PULL v2 20/35] Revert "ppc: well form kvmppc_hint_smt_possible error hint helper" |
Date: |
Wed, 18 Dec 2019 09:17:06 +0100 |
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 <address@hidden>
---
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 47b08a4030..98bd7d5da6 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;
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index f11422fc41..32e1cc1d3f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2486,7 +2486,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_error_append_smt_possible_hint(&local_err);
+ kvmppc_hint_smt_possible(&local_err);
goto out;
}
}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 7406d18945..c77f9848ec 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");
}
}
--
2.21.0
- [PULL v2 00/35] Error reporting patches for 2019-12-17, Markus Armbruster, 2019/12/18
- [PULL v2 01/35] error: Fix -msg timestamp default, Markus Armbruster, 2019/12/18
- [PULL v2 02/35] crypto: Fix certificate file error handling crash bug, Markus Armbruster, 2019/12/18
- [PULL v2 18/35] vnc: drop Error pointer indirection in vnc_client_io_error, Markus Armbruster, 2019/12/18
- [PULL v2 20/35] Revert "ppc: well form kvmppc_hint_smt_possible error hint helper",
Markus Armbruster <=
- [PULL v2 14/35] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/18
- [PULL v2 07/35] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 06/35] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 05/35] tests: Clean up initialization of Error *err variables, Markus Armbruster, 2019/12/18
- [PULL v2 10/35] qga: Fix guest-get-fsinfo error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 21/35] ppc: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 11/35] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 25/35] hw/i386/amd_iommu: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 19/35] qdev-monitor: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18
- [PULL v2 22/35] 9pfs: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/18