1. Patchew
  2. QEMU
  3. View series

[PATCH] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu

Ilya Leoshkevich posted 1 patch 3 years, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220725142854.177451-1-iii@linux.ibm.com
Maintainers: Yoshinori Sato <ysato@users.sourceforge.jp>
There is a newer version of this series
target/sh4/translate.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
[PATCH] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu
Posted by Ilya Leoshkevich 3 years, 6 months ago 
When using QEMU_LOG=cpu on sh4, QEMU_LOG_FILENAME is partially ignored.
Fix by using qemu_fprintf() instead of qemu_printf() in the respective
places.

Fixes: 90c84c560067 ("qom/cpu: Simplify how CPUClass:cpu_dump_state() prints")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 target/sh4/translate.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/sh4/translate.c b/target/sh4/translate.c
index f1b190e7cf..9aadaf52cd 100644
--- a/target/sh4/translate.c
+++ b/target/sh4/translate.c
@@ -171,16 +171,16 @@ void superh_cpu_dump_state(CPUState *cs, FILE *f, int flags)
     qemu_fprintf(f, "sgr=0x%08x dbr=0x%08x delayed_pc=0x%08x fpul=0x%08x\n",
                  env->sgr, env->dbr, env->delayed_pc, env->fpul);
     for (i = 0; i < 24; i += 4) {
-        qemu_printf("r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
-		    i, env->gregs[i], i + 1, env->gregs[i + 1],
-		    i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
+        qemu_fprintf(f, "r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
+                     i, env->gregs[i], i + 1, env->gregs[i + 1],
+                     i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
     }
     if (env->flags & DELAY_SLOT) {
-        qemu_printf("in delay slot (delayed_pc=0x%08x)\n",
-		    env->delayed_pc);
+        qemu_fprintf(f, "in delay slot (delayed_pc=0x%08x)\n",
+                     env->delayed_pc);
     } else if (env->flags & DELAY_SLOT_CONDITIONAL) {
-        qemu_printf("in conditional delay slot (delayed_pc=0x%08x)\n",
-		    env->delayed_pc);
+        qemu_fprintf(f, "in conditional delay slot (delayed_pc=0x%08x)\n",
+                     env->delayed_pc);
     } else if (env->flags & DELAY_SLOT_RTE) {
         qemu_fprintf(f, "in rte delay slot (delayed_pc=0x%08x)\n",
                      env->delayed_pc);
-- 
2.35.3
Re: [PATCH] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu
Posted by Yoshinori Sato 3 years, 6 months ago 
On Mon, 25 Jul 2022 23:28:54 +0900,
Ilya Leoshkevich wrote:
> 
> When using QEMU_LOG=cpu on sh4, QEMU_LOG_FILENAME is partially ignored.
> Fix by using qemu_fprintf() instead of qemu_printf() in the respective
> places.
> 
> Fixes: 90c84c560067 ("qom/cpu: Simplify how CPUClass:cpu_dump_state() prints")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
>  target/sh4/translate.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/target/sh4/translate.c b/target/sh4/translate.c
> index f1b190e7cf..9aadaf52cd 100644
> --- a/target/sh4/translate.c
> +++ b/target/sh4/translate.c
> @@ -171,16 +171,16 @@ void superh_cpu_dump_state(CPUState *cs, FILE *f, int flags)
>      qemu_fprintf(f, "sgr=0x%08x dbr=0x%08x delayed_pc=0x%08x fpul=0x%08x\n",
>                   env->sgr, env->dbr, env->delayed_pc, env->fpul);
>      for (i = 0; i < 24; i += 4) {
> -        qemu_printf("r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
> -		    i, env->gregs[i], i + 1, env->gregs[i + 1],
> -		    i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
> +        qemu_fprintf(f, "r%d=0x%08x r%d=0x%08x r%d=0x%08x r%d=0x%08x\n",
> +                     i, env->gregs[i], i + 1, env->gregs[i + 1],
> +                     i + 2, env->gregs[i + 2], i + 3, env->gregs[i + 3]);
>      }
>      if (env->flags & DELAY_SLOT) {
> -        qemu_printf("in delay slot (delayed_pc=0x%08x)\n",
> -		    env->delayed_pc);
> +        qemu_fprintf(f, "in delay slot (delayed_pc=0x%08x)\n",
> +                     env->delayed_pc);
>      } else if (env->flags & DELAY_SLOT_CONDITIONAL) {
> -        qemu_printf("in conditional delay slot (delayed_pc=0x%08x)\n",
> -		    env->delayed_pc);
> +        qemu_fprintf(f, "in conditional delay slot (delayed_pc=0x%08x)\n",
> +                     env->delayed_pc);
>      } else if (env->flags & DELAY_SLOT_RTE) {
>          qemu_fprintf(f, "in rte delay slot (delayed_pc=0x%08x)\n",
>                       env->delayed_pc);
> -- 
> 2.35.3
> 

Reviewd-by: Yoshinori Sato <ysato@users.sourceforge.jp>

-- 
Yosinori Sato
Re: [PATCH] target/sh4: Honor QEMU_LOG_FILENAME with QEMU_LOG=cpu
Posted by Peter Maydell 3 years, 6 months ago 
On Mon, 25 Jul 2022 at 15:32, Ilya Leoshkevich <iii@linux.ibm.com> wrote:
>
> When using QEMU_LOG=cpu on sh4, QEMU_LOG_FILENAME is partially ignored.
> Fix by using qemu_fprintf() instead of qemu_printf() in the respective
> places.
>
> Fixes: 90c84c560067 ("qom/cpu: Simplify how CPUClass:cpu_dump_state() prints")
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Looks like sh4 was the only target where 90c84c560067 introduced this bug.

thanks
-- PMM

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.