[v2] Random cleanup patches

[PATCH v2 09/10] accel/tcg: Inline dump_opcount_info() and remove it

Posted by Bernhard Beschow 3 years, 1 month ago

dump_opcount_info() is a one-line wrapper around tcg_dump_op_count()
which is also exported. So use the latter directly.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 accel/tcg/cpu-exec.c      | 2 +-
 accel/tcg/translate-all.c | 5 -----
 include/exec/cpu-all.h    | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 7cbf9996b7..a565a3f8ec 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -1091,7 +1091,7 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)
         return NULL;
     }
 
-    dump_opcount_info(buf);
+    tcg_dump_op_count(buf);
 
     return human_readable_text_from_str(buf);
 }
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 291034cb09..8fd23a9d05 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -2124,11 +2124,6 @@ void dump_exec_info(GString *buf)
     tcg_dump_info(buf);
 }
 
-void dump_opcount_info(GString *buf)
-{
-    tcg_dump_op_count(buf);
-}
-
 #else /* CONFIG_USER_ONLY */
 
 void cpu_interrupt(CPUState *cpu, int mask)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 9a716be80d..f5bda2c3ca 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -421,7 +421,6 @@ static inline bool tlb_hit(target_ulong tlb_addr, target_ulong addr)
 #ifdef CONFIG_TCG
 /* accel/tcg/translate-all.c */
 void dump_exec_info(GString *buf);
-void dump_opcount_info(GString *buf);
 #endif /* CONFIG_TCG */
 
 #endif /* !CONFIG_USER_ONLY */
-- 
2.36.1

Re: [PATCH v2 09/10] accel/tcg: Inline dump_opcount_info() and remove it

Posted by Philippe Mathieu-Daudé via 3 years, 1 month ago

On 20/5/22 20:01, Bernhard Beschow wrote:
> dump_opcount_info() is a one-line wrapper around tcg_dump_op_count()
> which is also exported. So use the latter directly.
> 
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   accel/tcg/cpu-exec.c      | 2 +-
>   accel/tcg/translate-all.c | 5 -----
>   include/exec/cpu-all.h    | 1 -
>   3 files changed, 1 insertion(+), 7 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH v2 09/10] accel/tcg: Inline dump_opcount_info() and remove it

Posted by Bernhard Beschow 3 years, 1 month ago

Am 20. Mai 2022 18:01:08 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>dump_opcount_info() is a one-line wrapper around tcg_dump_op_count()
>which is also exported. So use the latter directly.
>
>Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>---
> accel/tcg/cpu-exec.c      | 2 +-
> accel/tcg/translate-all.c | 5 -----
> include/exec/cpu-all.h    | 1 -
> 3 files changed, 1 insertion(+), 7 deletions(-)
>
>diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
>index 7cbf9996b7..a565a3f8ec 100644
>--- a/accel/tcg/cpu-exec.c
>+++ b/accel/tcg/cpu-exec.c
>@@ -1091,7 +1091,7 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)
>         return NULL;
>     }
> 
>-    dump_opcount_info(buf);
>+    tcg_dump_op_count(buf);
> 
>     return human_readable_text_from_str(buf);
> }
>diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
>index 291034cb09..8fd23a9d05 100644
>--- a/accel/tcg/translate-all.c
>+++ b/accel/tcg/translate-all.c
>@@ -2124,11 +2124,6 @@ void dump_exec_info(GString *buf)
>     tcg_dump_info(buf);
> }
> 
>-void dump_opcount_info(GString *buf)
>-{
>-    tcg_dump_op_count(buf);
>-}
>-
> #else /* CONFIG_USER_ONLY */
> 
> void cpu_interrupt(CPUState *cpu, int mask)
>diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
>index 9a716be80d..f5bda2c3ca 100644
>--- a/include/exec/cpu-all.h
>+++ b/include/exec/cpu-all.h
>@@ -421,7 +421,6 @@ static inline bool tlb_hit(target_ulong tlb_addr, target_ulong addr)
> #ifdef CONFIG_TCG
> /* accel/tcg/translate-all.c */
> void dump_exec_info(GString *buf);
>-void dump_opcount_info(GString *buf);
> #endif /* CONFIG_TCG */
> 
> #endif /* !CONFIG_USER_ONLY */

Ping