Re: [PATCH v6 02/14] arm/cpu: Store aa64isar0/aa64zfr0 into the idregs arrays

[Cornelia Huck <cohuck@redhat.com>]

On Tue, May 13 2025, Daniel P. Berrangé <berrange@redhat.com> wrote:

> On Tue, May 06, 2025 at 10:52:22AM +0200, Cornelia Huck wrote:
>> From: Eric Auger <eric.auger@redhat.com>
>> 
>> Also add kvm accessors for storing host features into idregs.
>> 
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Reviewed-by: Sebastian Ott <sebott@redhat.com>
>> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
>> ---
>>  target/arm/cpu-features.h | 57 ++++++++++++++++++++-------------------
>>  target/arm/cpu.c          | 10 +++----
>>  target/arm/cpu.h          |  2 --
>>  target/arm/cpu64.c        |  8 +++---
>>  target/arm/helper.c       |  6 +++--
>>  target/arm/hvf/hvf.c      |  3 ++-
>>  target/arm/kvm.c          | 30 ++++++++++++++++++---
>>  target/arm/tcg/cpu64.c    | 44 ++++++++++++++++++------------
>>  8 files changed, 97 insertions(+), 63 deletions(-)
>> 
>
>> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
>> index 5e951675c606..dc4b6edaa1d6 100644
>> --- a/target/arm/cpu.c
>> +++ b/target/arm/cpu.c
>> @@ -2225,12 +2226,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
>>      }
>>  
>>      if (!cpu->has_neon && !cpu->has_vfp) {
>> -        uint64_t t;
>
> Premature removal because ....
>
>>          uint32_t u;
>>  
>> -        t = cpu->isar.id_aa64isar0;
>> -        t = FIELD_DP64(t, ID_AA64ISAR0, FHM, 0);
>> -        cpu->isar.id_aa64isar0 = t;
>> +        FIELD_DP64_IDREG(isar, ID_AA64ISAR0, FHM, 0);
>>  
>>          t = cpu->isar.id_aa64isar1;
>
> ...it is still used here and so breaks the build.
>
> Your next patch removes this line, so just need
> to shift the variable removal to the next patch
>
>>          t = FIELD_DP64(t, ID_AA64ISAR1, FRINTTS, 0);

To a v7 it goes, hopefully the last one...