[PATCH] Trim some trailing space from human-readable output

[PATCH] Trim some trailing space from human-readable output

[Markus Armbruster]

I noticed -cpu help printing enough trailing spaces to make the output
at least 84 characters wide.  Looks ugly unless the terminal is wider.
Ugly or not, trailing spaces are stupid.

The culprit is this line in x86_cpu_list_entry():

    qemu_printf("x86 %-20s  %-58s\n", name, desc);

This prints a string with minimum field left-justified right before a
newline.  Change it to

    qemu_printf("x86 %-20s  %s\n", name, desc);

which avoids the trailing spaces and is simpler to boot.

A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
more instances.  Change them similarly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 monitor/hmp-cmds.c         | 2 +-
 target/i386/cpu-dump.c     | 4 ++--
 target/i386/cpu.c          | 2 +-
 target/ppc/cpu_init.c      | 2 +-
 target/s390x/cpu_models.c  | 4 ++--
 target/xtensa/mmu_helper.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index bcaa41350e..9e45a138a5 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1945,7 +1945,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "      port  link    duplex neg?\n");
 
     for (port = list; port; port = port->next) {
-        monitor_printf(mon, "%10s  %-4s   %-3s  %2s  %-3s\n",
+        monitor_printf(mon, "%10s  %-4s   %-3s  %2s  %s\n",
                        port->value->name,
                        port->value->enabled ? port->value->link_up ?
                        "up" : "down" : "!ena",
diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c
index 02b635a52c..08ac957e99 100644
--- a/target/i386/cpu-dump.c
+++ b/target/i386/cpu-dump.c
@@ -464,13 +464,13 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int flags)
             snprintf(cc_op_name, sizeof(cc_op_name), "[%d]", env->cc_op);
 #ifdef TARGET_X86_64
         if (env->hflags & HF_CS64_MASK) {
-            qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%-8s\n",
+            qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%s\n",
                          env->cc_src, env->cc_dst,
                          cc_op_name);
         } else
 #endif
         {
-            qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%-8s\n",
+            qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%s\n",
                          (uint32_t)env->cc_src, (uint32_t)env->cc_dst,
                          cc_op_name);
         }
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index a7b1b6aa93..8d2c0ded10 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -4876,7 +4876,7 @@ static void x86_cpu_list_entry(gpointer data, gpointer user_data)
         desc = g_strdup_printf("%s", model_id);
     }
 
-    qemu_printf("x86 %-20s  %-58s\n", name, desc);
+    qemu_printf("x86 %-20s  %s\n", name, desc);
 }
 
 /* list available CPU models and flags */
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 6aad01d1d3..8ab81dd1ed 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -8734,7 +8734,7 @@ void ppc_cpu_list(void)
 
 #ifdef CONFIG_KVM
     qemu_printf("\n");
-    qemu_printf("PowerPC %-16s\n", "host");
+    qemu_printf("PowerPC %s\n", "host");
 #endif
 }
 
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 4e4598cc77..11e06cc51f 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -398,14 +398,14 @@ void s390_cpu_list(void)
     for (feat = 0; feat < S390_FEAT_MAX; feat++) {
         const S390FeatDef *def = s390_feat_def(feat);
 
-        qemu_printf("%-20s %-50s\n", def->name, def->desc);
+        qemu_printf("%-20s %s\n", def->name, def->desc);
     }
 
     qemu_printf("\nRecognized feature groups:\n");
     for (group = 0; group < S390_FEAT_GROUP_MAX; group++) {
         const S390FeatGroupDef *def = s390_feat_group_def(group);
 
-        qemu_printf("%-20s %-50s\n", def->name, def->desc);
+        qemu_printf("%-20s %s\n", def->name, def->desc);
     }
 }
 
diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
index b01ff9399a..57e319a1af 100644
--- a/target/xtensa/mmu_helper.c
+++ b/target/xtensa/mmu_helper.c
@@ -1098,7 +1098,7 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb)
                     qemu_printf("\tVaddr       Paddr       ASID  Attr RWX Cache\n"
                                 "\t----------  ----------  ----  ---- --- -------\n");
                 }
-                qemu_printf("\t0x%08x  0x%08x  0x%02x  0x%02x %c%c%c %-7s\n",
+                qemu_printf("\t0x%08x  0x%08x  0x%02x  0x%02x %c%c%c %s\n",
                             entry->vaddr,
                             entry->paddr,
                             entry->asid,
-- 
2.31.1

Re: [PATCH] Trim some trailing space from human-readable output

[Richard Henderson]

On 10/9/21 8:24 AM, Markus Armbruster wrote:
> I noticed -cpu help printing enough trailing spaces to make the output
> at least 84 characters wide.  Looks ugly unless the terminal is wider.
> Ugly or not, trailing spaces are stupid.
> 
> The culprit is this line in x86_cpu_list_entry():
> 
>      qemu_printf("x86 %-20s  %-58s\n", name, desc);
> 
> This prints a string with minimum field left-justified right before a
> newline.  Change it to
> 
>      qemu_printf("x86 %-20s  %s\n", name, desc);
> 
> which avoids the trailing spaces and is simpler to boot.
> 
> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
> more instances.  Change them similarly.
> 
> Signed-off-by: Markus Armbruster<armbru@redhat.com>
> ---
>   monitor/hmp-cmds.c         | 2 +-
>   target/i386/cpu-dump.c     | 4 ++--
>   target/i386/cpu.c          | 2 +-
>   target/ppc/cpu_init.c      | 2 +-
>   target/s390x/cpu_models.c  | 4 ++--
>   target/xtensa/mmu_helper.c | 2 +-
>   6 files changed, 8 insertions(+), 8 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH] Trim some trailing space from human-readable output

[Greg Kurz]

On Sat,  9 Oct 2021 17:24:01 +0200
Markus Armbruster <armbru@redhat.com> wrote:

> I noticed -cpu help printing enough trailing spaces to make the output
> at least 84 characters wide.  Looks ugly unless the terminal is wider.
> Ugly or not, trailing spaces are stupid.
> 
> The culprit is this line in x86_cpu_list_entry():
> 
>     qemu_printf("x86 %-20s  %-58s\n", name, desc);
> 
> This prints a string with minimum field left-justified right before a
> newline.  Change it to
> 
>     qemu_printf("x86 %-20s  %s\n", name, desc);
> 
> which avoids the trailing spaces and is simpler to boot.
> 
> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
> more instances.  Change them similarly.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  monitor/hmp-cmds.c         | 2 +-
>  target/i386/cpu-dump.c     | 4 ++--
>  target/i386/cpu.c          | 2 +-
>  target/ppc/cpu_init.c      | 2 +-

ppc part

Acked-by: Greg Kurz <groug@kaod.org>

>  target/s390x/cpu_models.c  | 4 ++--
>  target/xtensa/mmu_helper.c | 2 +-
>  6 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index bcaa41350e..9e45a138a5 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -1945,7 +1945,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict)
>      monitor_printf(mon, "      port  link    duplex neg?\n");
>  
>      for (port = list; port; port = port->next) {
> -        monitor_printf(mon, "%10s  %-4s   %-3s  %2s  %-3s\n",
> +        monitor_printf(mon, "%10s  %-4s   %-3s  %2s  %s\n",
>                         port->value->name,
>                         port->value->enabled ? port->value->link_up ?
>                         "up" : "down" : "!ena",
> diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c
> index 02b635a52c..08ac957e99 100644
> --- a/target/i386/cpu-dump.c
> +++ b/target/i386/cpu-dump.c
> @@ -464,13 +464,13 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int flags)
>              snprintf(cc_op_name, sizeof(cc_op_name), "[%d]", env->cc_op);
>  #ifdef TARGET_X86_64
>          if (env->hflags & HF_CS64_MASK) {
> -            qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%-8s\n",
> +            qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%s\n",
>                           env->cc_src, env->cc_dst,
>                           cc_op_name);
>          } else
>  #endif
>          {
> -            qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%-8s\n",
> +            qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%s\n",
>                           (uint32_t)env->cc_src, (uint32_t)env->cc_dst,
>                           cc_op_name);
>          }
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index a7b1b6aa93..8d2c0ded10 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -4876,7 +4876,7 @@ static void x86_cpu_list_entry(gpointer data, gpointer user_data)
>          desc = g_strdup_printf("%s", model_id);
>      }
>  
> -    qemu_printf("x86 %-20s  %-58s\n", name, desc);
> +    qemu_printf("x86 %-20s  %s\n", name, desc);
>  }
>  
>  /* list available CPU models and flags */
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 6aad01d1d3..8ab81dd1ed 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -8734,7 +8734,7 @@ void ppc_cpu_list(void)
>  
>  #ifdef CONFIG_KVM
>      qemu_printf("\n");
> -    qemu_printf("PowerPC %-16s\n", "host");
> +    qemu_printf("PowerPC %s\n", "host");
>  #endif
>  }
>  
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index 4e4598cc77..11e06cc51f 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -398,14 +398,14 @@ void s390_cpu_list(void)
>      for (feat = 0; feat < S390_FEAT_MAX; feat++) {
>          const S390FeatDef *def = s390_feat_def(feat);
>  
> -        qemu_printf("%-20s %-50s\n", def->name, def->desc);
> +        qemu_printf("%-20s %s\n", def->name, def->desc);
>      }
>  
>      qemu_printf("\nRecognized feature groups:\n");
>      for (group = 0; group < S390_FEAT_GROUP_MAX; group++) {
>          const S390FeatGroupDef *def = s390_feat_group_def(group);
>  
> -        qemu_printf("%-20s %-50s\n", def->name, def->desc);
> +        qemu_printf("%-20s %s\n", def->name, def->desc);
>      }
>  }
>  
> diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
> index b01ff9399a..57e319a1af 100644
> --- a/target/xtensa/mmu_helper.c
> +++ b/target/xtensa/mmu_helper.c
> @@ -1098,7 +1098,7 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb)
>                      qemu_printf("\tVaddr       Paddr       ASID  Attr RWX Cache\n"
>                                  "\t----------  ----------  ----  ---- --- -------\n");
>                  }
> -                qemu_printf("\t0x%08x  0x%08x  0x%02x  0x%02x %c%c%c %-7s\n",
> +                qemu_printf("\t0x%08x  0x%08x  0x%02x  0x%02x %c%c%c %s\n",
>                              entry->vaddr,
>                              entry->paddr,
>                              entry->asid,

Re: [PATCH] Trim some trailing space from human-readable output

[Philippe Mathieu-Daudé]

On 10/9/21 17:24, Markus Armbruster wrote:
> I noticed -cpu help printing enough trailing spaces to make the output
> at least 84 characters wide.  Looks ugly unless the terminal is wider.
> Ugly or not, trailing spaces are stupid.
> 
> The culprit is this line in x86_cpu_list_entry():
> 
>     qemu_printf("x86 %-20s  %-58s\n", name, desc);
> 
> This prints a string with minimum field left-justified right before a
> newline.  Change it to
> 
>     qemu_printf("x86 %-20s  %s\n", name, desc);
> 
> which avoids the trailing spaces and is simpler to boot.
> 
> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
> more instances.  Change them similarly.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  monitor/hmp-cmds.c         | 2 +-
>  target/i386/cpu-dump.c     | 4 ++--
>  target/i386/cpu.c          | 2 +-
>  target/ppc/cpu_init.c      | 2 +-
>  target/s390x/cpu_models.c  | 4 ++--
>  target/xtensa/mmu_helper.c | 2 +-
>  6 files changed, 8 insertions(+), 8 deletions(-)

Nitpicking, do you mind prefixing the patch subject with 'monitor:'?

Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] Trim some trailing space from human-readable output

[Max Filippov]

On Sat, Oct 9, 2021 at 8:24 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> I noticed -cpu help printing enough trailing spaces to make the output
> at least 84 characters wide.  Looks ugly unless the terminal is wider.
> Ugly or not, trailing spaces are stupid.
>
> The culprit is this line in x86_cpu_list_entry():
>
>     qemu_printf("x86 %-20s  %-58s\n", name, desc);
>
> This prints a string with minimum field left-justified right before a
> newline.  Change it to
>
>     qemu_printf("x86 %-20s  %s\n", name, desc);
>
> which avoids the trailing spaces and is simpler to boot.
>
> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
> more instances.  Change them similarly.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  monitor/hmp-cmds.c         | 2 +-
>  target/i386/cpu-dump.c     | 4 ++--
>  target/i386/cpu.c          | 2 +-
>  target/ppc/cpu_init.c      | 2 +-
>  target/s390x/cpu_models.c  | 4 ++--
>  target/xtensa/mmu_helper.c | 2 +-
>  6 files changed, 8 insertions(+), 8 deletions(-)

For target/xtensa:
Acked-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

Re: [PATCH] Trim some trailing space from human-readable output

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 10/9/21 17:24, Markus Armbruster wrote:
>> I noticed -cpu help printing enough trailing spaces to make the output
>> at least 84 characters wide.  Looks ugly unless the terminal is wider.
>> Ugly or not, trailing spaces are stupid.
>> 
>> The culprit is this line in x86_cpu_list_entry():
>> 
>>     qemu_printf("x86 %-20s  %-58s\n", name, desc);
>> 
>> This prints a string with minimum field left-justified right before a
>> newline.  Change it to
>> 
>>     qemu_printf("x86 %-20s  %s\n", name, desc);
>> 
>> which avoids the trailing spaces and is simpler to boot.
>> 
>> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
>> more instances.  Change them similarly.
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  monitor/hmp-cmds.c         | 2 +-
>>  target/i386/cpu-dump.c     | 4 ++--
>>  target/i386/cpu.c          | 2 +-
>>  target/ppc/cpu_init.c      | 2 +-
>>  target/s390x/cpu_models.c  | 4 ++--
>>  target/xtensa/mmu_helper.c | 2 +-
>>  6 files changed, 8 insertions(+), 8 deletions(-)
>
> Nitpicking, do you mind prefixing the patch subject with 'monitor:'?

You're right, the code I patch is called from HMP commands, and probably
not from anywhere else.

> Otherwise:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks!

Re: [PATCH] Trim some trailing space from human-readable output

[Markus Armbruster]

Nominating for qemu-trivial.

Tweaking the subject to

    monitor: Trim some trailing space from human-readable output

as Philippe suggested would be nice.

Markus Armbruster <armbru@redhat.com> writes:

> I noticed -cpu help printing enough trailing spaces to make the output
> at least 84 characters wide.  Looks ugly unless the terminal is wider.
> Ugly or not, trailing spaces are stupid.
>
> The culprit is this line in x86_cpu_list_entry():
>
>     qemu_printf("x86 %-20s  %-58s\n", name, desc);
>
> This prints a string with minimum field left-justified right before a
> newline.  Change it to
>
>     qemu_printf("x86 %-20s  %s\n", name, desc);
>
> which avoids the trailing spaces and is simpler to boot.
>
> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
> more instances.  Change them similarly.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Re: [PATCH] Trim some trailing space from human-readable output

[Laurent Vivier]

Le 25/10/2021 à 11:12, Markus Armbruster a écrit :
> Nominating for qemu-trivial.
> 
> Tweaking the subject to
> 
>      monitor: Trim some trailing space from human-readable output
> 
> as Philippe suggested would be nice.
> 
> Markus Armbruster <armbru@redhat.com> writes:
> 
>> I noticed -cpu help printing enough trailing spaces to make the output
>> at least 84 characters wide.  Looks ugly unless the terminal is wider.
>> Ugly or not, trailing spaces are stupid.
>>
>> The culprit is this line in x86_cpu_list_entry():
>>
>>      qemu_printf("x86 %-20s  %-58s\n", name, desc);
>>
>> This prints a string with minimum field left-justified right before a
>> newline.  Change it to
>>
>>      qemu_printf("x86 %-20s  %s\n", name, desc);
>>
>> which avoids the trailing spaces and is simpler to boot.
>>
>> A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few
>> more instances.  Change them similarly.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> 
> 

Applied to my trivial-patches branch with updated subject

Thanks,
Laurent