[PATCH v2 21/85] target/arm: Do not migrate env->exception

Richard Henderson posted 85 patches 3 months, 2 weeks ago
There is a newer version of this series
[PATCH v2 21/85] target/arm: Do not migrate env->exception
Posted by Richard Henderson 3 months, 2 weeks ago
These are not architectural state, only placeholders
between identifying the exception and delivering it.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/machine.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/arm/machine.c b/target/arm/machine.c
index 6986915bee..8dbeca2867 100644
--- a/target/arm/machine.c
+++ b/target/arm/machine.c
@@ -1085,9 +1085,9 @@ const VMStateDescription vmstate_arm_cpu = {
         VMSTATE_UINT64(env.exclusive_val, ARMCPU),
         VMSTATE_UINT64(env.exclusive_high, ARMCPU),
         VMSTATE_UNUSED(sizeof(uint64_t)),
-        VMSTATE_UINT32(env.exception.syndrome, ARMCPU),
-        VMSTATE_UINT32(env.exception.fsr, ARMCPU),
-        VMSTATE_UINT64(env.exception.vaddress, ARMCPU),
+        VMSTATE_UNUSED(sizeof(uint32_t)),
+        VMSTATE_UNUSED(sizeof(uint32_t)),
+        VMSTATE_UNUSED(sizeof(uint64_t)),
         VMSTATE_TIMER_PTR(gt_timer[GTIMER_PHYS], ARMCPU),
         VMSTATE_TIMER_PTR(gt_timer[GTIMER_VIRT], ARMCPU),
         {
-- 
2.43.0
Re: [PATCH v2 21/85] target/arm: Do not migrate env->exception
Posted by Philippe Mathieu-Daudé 3 months ago
On 3/8/25 01:28, Richard Henderson wrote:
> These are not architectural state, only placeholders
> between identifying the exception and delivering it.
> 
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/arm/machine.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target/arm/machine.c b/target/arm/machine.c
> index 6986915bee..8dbeca2867 100644
> --- a/target/arm/machine.c
> +++ b/target/arm/machine.c
> @@ -1085,9 +1085,9 @@ const VMStateDescription vmstate_arm_cpu = {
>           VMSTATE_UINT64(env.exclusive_val, ARMCPU),
>           VMSTATE_UINT64(env.exclusive_high, ARMCPU),
>           VMSTATE_UNUSED(sizeof(uint64_t)),
> -        VMSTATE_UINT32(env.exception.syndrome, ARMCPU),
> -        VMSTATE_UINT32(env.exception.fsr, ARMCPU),
> -        VMSTATE_UINT64(env.exception.vaddress, ARMCPU),
> +        VMSTATE_UNUSED(sizeof(uint32_t)),
> +        VMSTATE_UNUSED(sizeof(uint32_t)),
> +        VMSTATE_UNUSED(sizeof(uint64_t)),

Alternatively 4 + 4 + 8 or sizeof() + sizeof() + sizeof().

>           VMSTATE_TIMER_PTR(gt_timer[GTIMER_PHYS], ARMCPU),
>           VMSTATE_TIMER_PTR(gt_timer[GTIMER_VIRT], ARMCPU),
>           {
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>