[PATCH-for-10.1 0/3] migration/cpu: Remove qemu_{get, put}_[s]betl[s] macros

[PATCH-for-10.1 0/3] migration/cpu: Remove qemu_{get, put}_[s]betl[s] macros

[Philippe Mathieu-Daudé]

The following macros:

 - qemu_put_betl()
 - qemu_get_betl()
 - qemu_put_betls()
 - qemu_get_betls()
 - qemu_put_sbetl()
 - qemu_get_sbetl()
 - qemu_put_sbetls()
 - qemu_get_sbetls()

are used twice. Expand tl -> 32/64 and remove them.

Philippe Mathieu-Daudé (3):
  target/mips: Inline qemu_get_betls() and qemu_put_betls()
  target/sparc: Inline qemu_get_betl() and qemu_put_betl()
  migration/cpu: Remove qemu_{get,put}_[s]betl[s] macros

 include/migration/cpu.h      | 18 ------------------
 target/mips/system/machine.c | 12 ++++++++++--
 target/sparc/machine.c       | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 22 deletions(-)

-- 
2.47.1

[PATCH-for-10.1 1/3] target/mips: Inline qemu_get_betls() and qemu_put_betls()

[Philippe Mathieu-Daudé]

We only use qemu_get_betls() and qemu_put_betls() once in
the whole code base. Inline them (checking TARGET_MIPS64
instead of TARGET_LONG_BITS == 64) so we can remove them
later as unused.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/mips/system/machine.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c
index 8af11fd896b..c4c92a9a1ca 100644
--- a/target/mips/system/machine.c
+++ b/target/mips/system/machine.c
@@ -139,7 +139,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size,
     r4k_tlb_t *v = pv;
     uint16_t flags;
 
-    qemu_get_betls(f, &v->VPN);
+#ifdef TARGET_MIPS64
+    qemu_get_be64s(f, &v->VPN);
+#else
+    qemu_get_be32s(f, &v->VPN);
+#endif
     qemu_get_be32s(f, &v->PageMask);
     qemu_get_be16s(f, &v->ASID);
     qemu_get_be32s(f, &v->MMID);
@@ -182,7 +186,11 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size,
                       (v->D0 << 1) |
                       (v->D1 << 0));
 
-    qemu_put_betls(f, &v->VPN);
+#ifdef TARGET_MIPS64
+    qemu_put_be64s(f, &v->VPN);
+#else
+    qemu_put_be32s(f, &v->VPN);
+#endif
     qemu_put_be32s(f, &v->PageMask);
     qemu_put_be16s(f, &asid);
     qemu_put_be32s(f, &mmid);
-- 
2.47.1

[PATCH-for-10.1 2/3] target/sparc: Inline qemu_get_betl() and qemu_put_betl()

[Philippe Mathieu-Daudé]

We only use qemu_get_betl() and qemu_put_betl() once in
the whole code base. Inline them (checking TARGET_SPARC64
instead of TARGET_LONG_BITS == 64) so we can remove them
later as unused.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/sparc/machine.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/target/sparc/machine.c b/target/sparc/machine.c
index 222e5709c55..cc58812781b 100644
--- a/target/sparc/machine.c
+++ b/target/sparc/machine.c
@@ -87,7 +87,13 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t size,
                    const VMStateField *field)
 {
     SPARCCPU *cpu = opaque;
-    target_ulong val = qemu_get_betl(f);
+    target_ulong val;
+
+#ifdef TARGET_SPARC64
+    val = qemu_get_be64(f);
+#else
+    val = qemu_get_be32(f);
+#endif
 
     cpu_put_fsr(&cpu->env, val);
     return 0;
@@ -99,7 +105,11 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t size,
     SPARCCPU *cpu = opaque;
     target_ulong val = cpu_get_fsr(&cpu->env);
 
-    qemu_put_betl(f, val);
+#ifdef TARGET_SPARC64
+    qemu_put_be64(f, val);
+#else
+    qemu_put_be32(f, val);
+#endif
     return 0;
 }
 
-- 
2.47.1

[PATCH-for-10.1 3/3] migration/cpu: Remove qemu_{get, put}_[s]betl[s] macros

[Philippe Mathieu-Daudé]

The following macros:

 - qemu_put_betl()
 - qemu_get_betl()
 - qemu_put_betls()
 - qemu_get_betls()
 - qemu_put_sbetl()
 - qemu_get_sbetl()
 - qemu_put_sbetls()
 - qemu_get_sbetls()

are not used in the whole code base, remove them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/migration/cpu.h | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/include/migration/cpu.h b/include/migration/cpu.h
index 65abe3c8cc0..5066939d4c9 100644
--- a/include/migration/cpu.h
+++ b/include/migration/cpu.h
@@ -8,15 +8,6 @@
 #include "migration/vmstate.h"
 
 #if TARGET_LONG_BITS == 64
-#define qemu_put_betl qemu_put_be64
-#define qemu_get_betl qemu_get_be64
-#define qemu_put_betls qemu_put_be64s
-#define qemu_get_betls qemu_get_be64s
-#define qemu_put_sbetl qemu_put_sbe64
-#define qemu_get_sbetl qemu_get_sbe64
-#define qemu_put_sbetls qemu_put_sbe64s
-#define qemu_get_sbetls qemu_get_sbe64s
-
 #define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
     VMSTATE_UINT64_V(_f, _s, _v)
 #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
@@ -29,15 +20,6 @@
     VMSTATE_UINT64_TEST(_f, _s, _t)
 #define vmstate_info_uinttl vmstate_info_uint64
 #else
-#define qemu_put_betl qemu_put_be32
-#define qemu_get_betl qemu_get_be32
-#define qemu_put_betls qemu_put_be32s
-#define qemu_get_betls qemu_get_be32s
-#define qemu_put_sbetl qemu_put_sbe32
-#define qemu_get_sbetl qemu_get_sbe32
-#define qemu_put_sbetls qemu_put_sbe32s
-#define qemu_get_sbetls qemu_get_sbe32s
-
 #define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
     VMSTATE_UINT32_V(_f, _s, _v)
 #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
-- 
2.47.1

Re: [PATCH-for-10.1 3/3] migration/cpu: Remove qemu_{get,put}_[s]betl[s] macros

[Fabiano Rosas]

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> The following macros:
>
>  - qemu_put_betl()
>  - qemu_get_betl()
>  - qemu_put_betls()
>  - qemu_get_betls()
>  - qemu_put_sbetl()
>  - qemu_get_sbetl()
>  - qemu_put_sbetls()
>  - qemu_get_sbetls()
>
> are not used in the whole code base, remove them.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Fabiano Rosas <farosas@suse.de>

Re: [PATCH-for-10.1 1/3] target/mips: Inline qemu_get_betls() and qemu_put_betls()

[Pierrick Bouvier]

On 3/23/25 15:50, Philippe Mathieu-Daudé wrote:
> We only use qemu_get_betls() and qemu_put_betls() once in
> the whole code base. Inline them (checking TARGET_MIPS64
> instead of TARGET_LONG_BITS == 64) so we can remove them
> later as unused.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/mips/system/machine.c | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c
> index 8af11fd896b..c4c92a9a1ca 100644
> --- a/target/mips/system/machine.c
> +++ b/target/mips/system/machine.c
> @@ -139,7 +139,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size,
>       r4k_tlb_t *v = pv;
>       uint16_t flags;
>   
> -    qemu_get_betls(f, &v->VPN);
> +#ifdef TARGET_MIPS64
> +    qemu_get_be64s(f, &v->VPN);
> +#else
> +    qemu_get_be32s(f, &v->VPN);
> +#endif
>       qemu_get_be32s(f, &v->PageMask);
>       qemu_get_be16s(f, &v->ASID);
>       qemu_get_be32s(f, &v->MMID);
> @@ -182,7 +186,11 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size,
>                         (v->D0 << 1) |
>                         (v->D1 << 0));
>   
> -    qemu_put_betls(f, &v->VPN);
> +#ifdef TARGET_MIPS64
> +    qemu_put_be64s(f, &v->VPN);
> +#else
> +    qemu_put_be32s(f, &v->VPN);
> +#endif
>       qemu_put_be32s(f, &v->PageMask);
>       qemu_put_be16s(f, &asid);
>       qemu_put_be32s(f, &mmid);

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH-for-10.1 2/3] target/sparc: Inline qemu_get_betl() and qemu_put_betl()

[Pierrick Bouvier]

On 3/23/25 15:50, Philippe Mathieu-Daudé wrote:
> We only use qemu_get_betl() and qemu_put_betl() once in
> the whole code base. Inline them (checking TARGET_SPARC64
> instead of TARGET_LONG_BITS == 64) so we can remove them
> later as unused.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/sparc/machine.c | 14 ++++++++++++--
>   1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/target/sparc/machine.c b/target/sparc/machine.c
> index 222e5709c55..cc58812781b 100644
> --- a/target/sparc/machine.c
> +++ b/target/sparc/machine.c
> @@ -87,7 +87,13 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t size,
>                      const VMStateField *field)
>   {
>       SPARCCPU *cpu = opaque;
> -    target_ulong val = qemu_get_betl(f);
> +    target_ulong val;
> +
> +#ifdef TARGET_SPARC64
> +    val = qemu_get_be64(f);
> +#else
> +    val = qemu_get_be32(f);
> +#endif
>   
>       cpu_put_fsr(&cpu->env, val);
>       return 0;
> @@ -99,7 +105,11 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t size,
>       SPARCCPU *cpu = opaque;
>       target_ulong val = cpu_get_fsr(&cpu->env);
>   
> -    qemu_put_betl(f, val);
> +#ifdef TARGET_SPARC64
> +    qemu_put_be64(f, val);
> +#else
> +    qemu_put_be32(f, val);
> +#endif
>       return 0;
>   }
>   

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH-for-10.1 3/3] migration/cpu: Remove qemu_{get,put}_[s]betl[s] macros

[Pierrick Bouvier]

On 3/23/25 15:50, Philippe Mathieu-Daudé wrote:
> The following macros:
> 
>   - qemu_put_betl()
>   - qemu_get_betl()
>   - qemu_put_betls()
>   - qemu_get_betls()
>   - qemu_put_sbetl()
>   - qemu_get_sbetl()
>   - qemu_put_sbetls()
>   - qemu_get_sbetls()
> 
> are not used in the whole code base, remove them.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/migration/cpu.h | 18 ------------------
>   1 file changed, 18 deletions(-)
> 
> diff --git a/include/migration/cpu.h b/include/migration/cpu.h
> index 65abe3c8cc0..5066939d4c9 100644
> --- a/include/migration/cpu.h
> +++ b/include/migration/cpu.h
> @@ -8,15 +8,6 @@
>   #include "migration/vmstate.h"
>   
>   #if TARGET_LONG_BITS == 64
> -#define qemu_put_betl qemu_put_be64
> -#define qemu_get_betl qemu_get_be64
> -#define qemu_put_betls qemu_put_be64s
> -#define qemu_get_betls qemu_get_be64s
> -#define qemu_put_sbetl qemu_put_sbe64
> -#define qemu_get_sbetl qemu_get_sbe64
> -#define qemu_put_sbetls qemu_put_sbe64s
> -#define qemu_get_sbetls qemu_get_sbe64s
> -
>   #define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
>       VMSTATE_UINT64_V(_f, _s, _v)
>   #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \
> @@ -29,15 +20,6 @@
>       VMSTATE_UINT64_TEST(_f, _s, _t)
>   #define vmstate_info_uinttl vmstate_info_uint64
>   #else
> -#define qemu_put_betl qemu_put_be32
> -#define qemu_get_betl qemu_get_be32
> -#define qemu_put_betls qemu_put_be32s
> -#define qemu_get_betls qemu_get_be32s
> -#define qemu_put_sbetl qemu_put_sbe32
> -#define qemu_get_sbetl qemu_get_sbe32
> -#define qemu_put_sbetls qemu_put_sbe32s
> -#define qemu_get_sbetls qemu_get_sbe32s
> -
>   #define VMSTATE_UINTTL_V(_f, _s, _v)                                  \
>       VMSTATE_UINT32_V(_f, _s, _v)
>   #define VMSTATE_UINTTL_EQUAL_V(_f, _s, _v)                            \

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>