Re: [PATCH 3/5] target/i386: convert to use format_state instead of dump_state

[Ján Tomko]

On a Wednesday in 2021, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> target/i386/cpu-dump.c | 325 ++++++++++++++++++++++-------------------
> target/i386/cpu.c      |   2 +-
> target/i386/cpu.h      |   2 +-
> 3 files changed, 174 insertions(+), 155 deletions(-)
>
> diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c
> index 02b635a52c..8e19485a20 100644
> --- a/target/i386/cpu-dump.c
> +++ b/target/i386/cpu-dump.c

[...]

> @@ -355,107 +359,116 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int 
> flags)

[...]

>     {
> -        qemu_fprintf(f, "GDT=     %08x %08x\n",
> -                     (uint32_t)env->gdt.base, env->gdt.limit);
> -        qemu_fprintf(f, "IDT=     %08x %08x\n",
> -                     (uint32_t)env->idt.base, env->idt.limit);
> -        qemu_fprintf(f, "CR0=%08x CR2=%08x CR3=%08x CR4=%08x\n",
> -                     (uint32_t)env->cr[0],
> -                     (uint32_t)env->cr[2],
> -                     (uint32_t)env->cr[3],
> -                     (uint32_t)env->cr[4]);
> +        g_string_append_printf(buf, "GDT=     %08x %08x\n",
> +                               (uint32_t)env->gdt.base, env->gdt.limit);
> +        g_string_append_printf(buf, "IDT=     %08x %08x\n",
> +                               (uint32_t)env->idt.base, env->idt.limit);
> +        g_string_append_printf(buf, "CR0=%08x CR2=%08x CR3=%08x CR4=%08x\n",
> +                               (uint32_t)env->cr[0],
> +                               (uint32_t)env->cr[2],
> +                               (uint32_t)env->cr[3],
> +                               (uint32_t)env->cr[4]);
>         for(i = 0; i < 4; i++) {
> -            qemu_fprintf(f, "DR%d=" TARGET_FMT_lx " ", i, env->dr[i]);
> +            g_string_append_printf(buf, "DR%d=" TARGET_FMT_lx
> +                                   " ", i, env->dr[i]);

The formatting string can comfortably fit on the first line here.

Jano

>         }
> -        qemu_fprintf(f, "\nDR6=" TARGET_FMT_lx " DR7=" TARGET_FMT_lx "\n",
> -                     env->dr[6], env->dr[7]);
> +        g_string_append_printf(buf, "\nDR6=" TARGET_FMT_lx
> +                               " DR7=" TARGET_FMT_lx "\n",
> +                               env->dr[6], env->dr[7]);

signature.asc
Description: PGP signature