1. Patchew
  2. QEMU
  3. View series

[PATCH v2] target/alpha: Replace VMSTATE_UINTTL() -> VMSTATE_UINT64()

Philippe Mathieu-Daudé posted 1 patch 4 months, 2 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20250925005137.59378-1-philmd@linaro.org
Maintainers: Richard Henderson <richard.henderson@linaro.org>
target/alpha/machine.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
[PATCH v2] target/alpha: Replace VMSTATE_UINTTL() -> VMSTATE_UINT64()
Posted by Philippe Mathieu-Daudé 4 months, 2 weeks ago 
All these CPUAlphaState fields are of uint64_t type (except
the @fir[] array which uses float64, expanded to the same
type definition). Use the appropriate VMSTATE_UINT64() macro.

There is no functional change (the migration stream is not
modified), because the Alpha targets are only built as 64-bit:

  $ git grep TARGET_LONG_BITS configs/targets/alpha*
  configs/targets/alpha-linux-user.mak:4:TARGET_LONG_BITS=64
  configs/targets/alpha-softmmu.mak:2:TARGET_LONG_BITS=64

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
v2: "target is" -> "targets are"
---
 target/alpha/machine.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/target/alpha/machine.c b/target/alpha/machine.c
index 5f302b166da..6828b123ca1 100644
--- a/target/alpha/machine.c
+++ b/target/alpha/machine.c
@@ -25,8 +25,8 @@ static const VMStateInfo vmstate_fpcr = {
 };
 
 static const VMStateField vmstate_env_fields[] = {
-    VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31),
-    VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31),
+    VMSTATE_UINT64_ARRAY(ir, CPUAlphaState, 31),
+    VMSTATE_UINT64_ARRAY(fir, CPUAlphaState, 31),
     /* Save the architecture value of the fpcr, not the internally
        expanded version.  Since this architecture value does not
        exist in memory to be stored, this requires a but of hoop
@@ -41,27 +41,27 @@ static const VMStateField vmstate_env_fields[] = {
         .flags = VMS_SINGLE,
         .offset = 0
     },
-    VMSTATE_UINTTL(pc, CPUAlphaState),
-    VMSTATE_UINTTL(unique, CPUAlphaState),
-    VMSTATE_UINTTL(lock_addr, CPUAlphaState),
-    VMSTATE_UINTTL(lock_value, CPUAlphaState),
+    VMSTATE_UINT64(pc, CPUAlphaState),
+    VMSTATE_UINT64(unique, CPUAlphaState),
+    VMSTATE_UINT64(lock_addr, CPUAlphaState),
+    VMSTATE_UINT64(lock_value, CPUAlphaState),
 
     VMSTATE_UINT32(flags, CPUAlphaState),
     VMSTATE_UINT32(pcc_ofs, CPUAlphaState),
 
-    VMSTATE_UINTTL(trap_arg0, CPUAlphaState),
-    VMSTATE_UINTTL(trap_arg1, CPUAlphaState),
-    VMSTATE_UINTTL(trap_arg2, CPUAlphaState),
+    VMSTATE_UINT64(trap_arg0, CPUAlphaState),
+    VMSTATE_UINT64(trap_arg1, CPUAlphaState),
+    VMSTATE_UINT64(trap_arg2, CPUAlphaState),
 
-    VMSTATE_UINTTL(exc_addr, CPUAlphaState),
-    VMSTATE_UINTTL(palbr, CPUAlphaState),
-    VMSTATE_UINTTL(ptbr, CPUAlphaState),
-    VMSTATE_UINTTL(vptptr, CPUAlphaState),
-    VMSTATE_UINTTL(sysval, CPUAlphaState),
-    VMSTATE_UINTTL(usp, CPUAlphaState),
+    VMSTATE_UINT64(exc_addr, CPUAlphaState),
+    VMSTATE_UINT64(palbr, CPUAlphaState),
+    VMSTATE_UINT64(ptbr, CPUAlphaState),
+    VMSTATE_UINT64(vptptr, CPUAlphaState),
+    VMSTATE_UINT64(sysval, CPUAlphaState),
+    VMSTATE_UINT64(usp, CPUAlphaState),
 
-    VMSTATE_UINTTL_ARRAY(shadow, CPUAlphaState, 8),
-    VMSTATE_UINTTL_ARRAY(scratch, CPUAlphaState, 24),
+    VMSTATE_UINT64_ARRAY(shadow, CPUAlphaState, 8),
+    VMSTATE_UINT64_ARRAY(scratch, CPUAlphaState, 24),
 
     VMSTATE_END_OF_LIST()
 };
-- 
2.51.0
Re: [PATCH v2] target/alpha: Replace VMSTATE_UINTTL() -> VMSTATE_UINT64()
Posted by Philippe Mathieu-Daudé 4 months ago 
On 25/9/25 02:51, Philippe Mathieu-Daudé wrote:
> All these CPUAlphaState fields are of uint64_t type (except
> the @fir[] array which uses float64, expanded to the same
> type definition). Use the appropriate VMSTATE_UINT64() macro.
> 
> There is no functional change (the migration stream is not
> modified), because the Alpha targets are only built as 64-bit:
> 
>    $ git grep TARGET_LONG_BITS configs/targets/alpha*
>    configs/targets/alpha-linux-user.mak:4:TARGET_LONG_BITS=64
>    configs/targets/alpha-softmmu.mak:2:TARGET_LONG_BITS=64
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> v2: "target is" -> "targets are"
> ---
>   target/alpha/machine.c | 34 +++++++++++++++++-----------------
>   1 file changed, 17 insertions(+), 17 deletions(-)

Patch queued, thanks.
Re: [PATCH v2] target/alpha: Replace VMSTATE_UINTTL() -> VMSTATE_UINT64()
Posted by Anton Johansson via 4 months ago 
On 25/09/25, Philippe Mathieu-Daudé wrote:
> All these CPUAlphaState fields are of uint64_t type (except
> the @fir[] array which uses float64, expanded to the same
> type definition). Use the appropriate VMSTATE_UINT64() macro.
> 
> There is no functional change (the migration stream is not
> modified), because the Alpha targets are only built as 64-bit:
> 
>   $ git grep TARGET_LONG_BITS configs/targets/alpha*
>   configs/targets/alpha-linux-user.mak:4:TARGET_LONG_BITS=64
>   configs/targets/alpha-softmmu.mak:2:TARGET_LONG_BITS=64
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> v2: "target is" -> "targets are"
> ---
>  target/alpha/machine.c | 34 +++++++++++++++++-----------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/target/alpha/machine.c b/target/alpha/machine.c
> index 5f302b166da..6828b123ca1 100644
> --- a/target/alpha/machine.c
> +++ b/target/alpha/machine.c
> @@ -25,8 +25,8 @@ static const VMStateInfo vmstate_fpcr = {
>  };
>  
>  static const VMStateField vmstate_env_fields[] = {
> -    VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31),
> -    VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31),
> +    VMSTATE_UINT64_ARRAY(ir, CPUAlphaState, 31),
> +    VMSTATE_UINT64_ARRAY(fir, CPUAlphaState, 31),
>      /* Save the architecture value of the fpcr, not the internally
>         expanded version.  Since this architecture value does not
>         exist in memory to be stored, this requires a but of hoop
> @@ -41,27 +41,27 @@ static const VMStateField vmstate_env_fields[] = {
>          .flags = VMS_SINGLE,
>          .offset = 0
>      },
> -    VMSTATE_UINTTL(pc, CPUAlphaState),
> -    VMSTATE_UINTTL(unique, CPUAlphaState),
> -    VMSTATE_UINTTL(lock_addr, CPUAlphaState),
> -    VMSTATE_UINTTL(lock_value, CPUAlphaState),
> +    VMSTATE_UINT64(pc, CPUAlphaState),
> +    VMSTATE_UINT64(unique, CPUAlphaState),
> +    VMSTATE_UINT64(lock_addr, CPUAlphaState),
> +    VMSTATE_UINT64(lock_value, CPUAlphaState),
>  
>      VMSTATE_UINT32(flags, CPUAlphaState),
>      VMSTATE_UINT32(pcc_ofs, CPUAlphaState),
>  
> -    VMSTATE_UINTTL(trap_arg0, CPUAlphaState),
> -    VMSTATE_UINTTL(trap_arg1, CPUAlphaState),
> -    VMSTATE_UINTTL(trap_arg2, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg0, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg1, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg2, CPUAlphaState),
>  
> -    VMSTATE_UINTTL(exc_addr, CPUAlphaState),
> -    VMSTATE_UINTTL(palbr, CPUAlphaState),
> -    VMSTATE_UINTTL(ptbr, CPUAlphaState),
> -    VMSTATE_UINTTL(vptptr, CPUAlphaState),
> -    VMSTATE_UINTTL(sysval, CPUAlphaState),
> -    VMSTATE_UINTTL(usp, CPUAlphaState),
> +    VMSTATE_UINT64(exc_addr, CPUAlphaState),
> +    VMSTATE_UINT64(palbr, CPUAlphaState),
> +    VMSTATE_UINT64(ptbr, CPUAlphaState),
> +    VMSTATE_UINT64(vptptr, CPUAlphaState),
> +    VMSTATE_UINT64(sysval, CPUAlphaState),
> +    VMSTATE_UINT64(usp, CPUAlphaState),
>  
> -    VMSTATE_UINTTL_ARRAY(shadow, CPUAlphaState, 8),
> -    VMSTATE_UINTTL_ARRAY(scratch, CPUAlphaState, 24),
> +    VMSTATE_UINT64_ARRAY(shadow, CPUAlphaState, 8),
> +    VMSTATE_UINT64_ARRAY(scratch, CPUAlphaState, 24),
>  
>      VMSTATE_END_OF_LIST()
>  };
> -- 
> 2.51.0
> 

Reviewed-by: Anton Johansson <anjo@rev.ng>
Re: [PATCH v2] target/alpha: Replace VMSTATE_UINTTL() -> VMSTATE_UINT64()
Posted by Philippe Mathieu-Daudé 4 months ago 
ping

On 25/9/25 02:51, Philippe Mathieu-Daudé wrote:
> All these CPUAlphaState fields are of uint64_t type (except
> the @fir[] array which uses float64, expanded to the same
> type definition). Use the appropriate VMSTATE_UINT64() macro.
> 
> There is no functional change (the migration stream is not
> modified), because the Alpha targets are only built as 64-bit:
> 
>    $ git grep TARGET_LONG_BITS configs/targets/alpha*
>    configs/targets/alpha-linux-user.mak:4:TARGET_LONG_BITS=64
>    configs/targets/alpha-softmmu.mak:2:TARGET_LONG_BITS=64
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> v2: "target is" -> "targets are"
> ---
>   target/alpha/machine.c | 34 +++++++++++++++++-----------------
>   1 file changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/target/alpha/machine.c b/target/alpha/machine.c
> index 5f302b166da..6828b123ca1 100644
> --- a/target/alpha/machine.c
> +++ b/target/alpha/machine.c
> @@ -25,8 +25,8 @@ static const VMStateInfo vmstate_fpcr = {
>   };
>   
>   static const VMStateField vmstate_env_fields[] = {
> -    VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31),
> -    VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31),
> +    VMSTATE_UINT64_ARRAY(ir, CPUAlphaState, 31),
> +    VMSTATE_UINT64_ARRAY(fir, CPUAlphaState, 31),
>       /* Save the architecture value of the fpcr, not the internally
>          expanded version.  Since this architecture value does not
>          exist in memory to be stored, this requires a but of hoop
> @@ -41,27 +41,27 @@ static const VMStateField vmstate_env_fields[] = {
>           .flags = VMS_SINGLE,
>           .offset = 0
>       },
> -    VMSTATE_UINTTL(pc, CPUAlphaState),
> -    VMSTATE_UINTTL(unique, CPUAlphaState),
> -    VMSTATE_UINTTL(lock_addr, CPUAlphaState),
> -    VMSTATE_UINTTL(lock_value, CPUAlphaState),
> +    VMSTATE_UINT64(pc, CPUAlphaState),
> +    VMSTATE_UINT64(unique, CPUAlphaState),
> +    VMSTATE_UINT64(lock_addr, CPUAlphaState),
> +    VMSTATE_UINT64(lock_value, CPUAlphaState),
>   
>       VMSTATE_UINT32(flags, CPUAlphaState),
>       VMSTATE_UINT32(pcc_ofs, CPUAlphaState),
>   
> -    VMSTATE_UINTTL(trap_arg0, CPUAlphaState),
> -    VMSTATE_UINTTL(trap_arg1, CPUAlphaState),
> -    VMSTATE_UINTTL(trap_arg2, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg0, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg1, CPUAlphaState),
> +    VMSTATE_UINT64(trap_arg2, CPUAlphaState),
>   
> -    VMSTATE_UINTTL(exc_addr, CPUAlphaState),
> -    VMSTATE_UINTTL(palbr, CPUAlphaState),
> -    VMSTATE_UINTTL(ptbr, CPUAlphaState),
> -    VMSTATE_UINTTL(vptptr, CPUAlphaState),
> -    VMSTATE_UINTTL(sysval, CPUAlphaState),
> -    VMSTATE_UINTTL(usp, CPUAlphaState),
> +    VMSTATE_UINT64(exc_addr, CPUAlphaState),
> +    VMSTATE_UINT64(palbr, CPUAlphaState),
> +    VMSTATE_UINT64(ptbr, CPUAlphaState),
> +    VMSTATE_UINT64(vptptr, CPUAlphaState),
> +    VMSTATE_UINT64(sysval, CPUAlphaState),
> +    VMSTATE_UINT64(usp, CPUAlphaState),
>   
> -    VMSTATE_UINTTL_ARRAY(shadow, CPUAlphaState, 8),
> -    VMSTATE_UINTTL_ARRAY(scratch, CPUAlphaState, 24),
> +    VMSTATE_UINT64_ARRAY(shadow, CPUAlphaState, 8),
> +    VMSTATE_UINT64_ARRAY(scratch, CPUAlphaState, 24),
>   
>       VMSTATE_END_OF_LIST()
>   };

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.