VMSTATE_VARRAY_MULTIPLY() seems to be an "optimized" version of VMSTATE_UINTTL_ARRAY(), and is only used once. Prefer the generic macro. Bump the SPARC CPU migration stream version.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Message-Id: <[email protected]> --- include/migration/cpu.h | 2 -- target/sparc/machine.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 8260ce0a3b7..8d15783b8c1 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -13,7 +13,6 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define vmstate_info_uinttl vmstate_info_uint64 #else #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) @@ -21,7 +20,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define vmstate_info_uinttl vmstate_info_uint32 #endif #define VMSTATE_UINTTL(_f, _s) \ diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 0a449f2f8c6..5f402e098cf 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -189,9 +189,9 @@ static int cpu_pre_save(void *opaque) * versions are different. */ #ifndef TARGET_SPARC64 -#define SPARC_VMSTATE_VER 7 +#define SPARC_VMSTATE_VER 8 #else -#define SPARC_VMSTATE_VER 9 +#define SPARC_VMSTATE_VER 10 #endif const VMStateDescription vmstate_sparc_cpu = { @@ -202,8 +202,7 @@ const VMStateDescription vmstate_sparc_cpu = { .fields = (const VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gregs, SPARCCPU, 8), VMSTATE_UINT32(env.nwindows, SPARCCPU), - VMSTATE_VARRAY_MULTIPLY(env.regbase, SPARCCPU, env.nwindows, 16, - vmstate_info_uinttl, target_ulong), + VMSTATE_UINTTL_ARRAY(env.regbase, SPARCCPU, MAX_NWINDOWS * 16 + 8), VMSTATE_CPUDOUBLE_ARRAY(env.fpr, SPARCCPU, TARGET_DPREGS), VMSTATE_UINTTL(env.pc, SPARCCPU), VMSTATE_UINTTL(env.npc, SPARCCPU), -- 2.53.0
