diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c
index 2f56376d..77d494a9 100644
--- a/qemu/target-arm/helper.c
+++ b/qemu/target-arm/helper.c
@@ -2148,7 +2148,7 @@ static uint64_t midr_read(CPUARMState *env, const ARMCPRegInfo *ri)
     return raw_read(env, ri);
 }
 
-static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
+static uint64_t mpidr_read_val(CPUARMState *env)
 {
     ARMCPU *cpu = ARM_CPU(env->uc, arm_env_get_cpu(env));
     uint64_t mpidr = cpu->mp_affinity;
@@ -2166,6 +2166,11 @@ static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
     return mpidr;
 }
 
+static uint64_t mpidr_read(CPUARMState *env, const ARMCPRegInfo *ri)
+{
+    return mpidr_read_val(env);
+}
+
 static const ARMCPRegInfo mpidr_cp_reginfo[] = {
     { "MPIDR", 0,0,0, 3,0,5, ARM_CP_STATE_BOTH,
       ARM_CP_NO_RAW, PL1_R, 0, NULL, 0, 0, {0, 0},