make arm_cpu_pauth_finalize return a bool,
and make the name canonical for the module (cpu_pauth_finalize).
Signed-off-by: Claudio Fontana <cfont...@suse.de>
---
target/arm/tcg/cpu-pauth.h | 2 +-
target/arm/cpu.c | 3 +--
target/arm/tcg/cpu-pauth.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/arm/tcg/cpu-pauth.h b/target/arm/tcg/cpu-pauth.h
index af127876fe..a0ef74dc77 100644
--- a/target/arm/tcg/cpu-pauth.h
+++ b/target/arm/tcg/cpu-pauth.h
@@ -26,7 +26,7 @@
#include "cpu.h"
/* called by arm_cpu_finalize_features in realizefn */
-void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
+bool cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
/* add the CPU Pointer Authentication properties */
void cpu_pauth_add_props(Object *obj);
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 229ef989b4..b91c48cd2f 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -837,8 +837,7 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
* is in use, so the user will not be able to set them.
*/
if (tcg_enabled()) {
- arm_cpu_pauth_finalize(cpu, &local_err);
- if (local_err != NULL) {
+ if (!cpu_pauth_finalize(cpu, &local_err)) {
error_propagate(errp, local_err);
return;
}
diff --git a/target/arm/tcg/cpu-pauth.c b/target/arm/tcg/cpu-pauth.c
index 657c5dcbca..4f087923ac 100644
--- a/target/arm/tcg/cpu-pauth.c
+++ b/target/arm/tcg/cpu-pauth.c
@@ -25,7 +25,7 @@
#include "tcg/cpu-pauth.h"
#include "hw/qdev-properties.h"
-void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp)
+bool cpu_pauth_finalize(ARMCPU *cpu, Error **errp)
{
bool result = true;
int arch_val = 0, impdef_val = 0;
--
2.26.2
