Patchwork vl.c: Increase width of machine name column in "-M ?" output

login
register
mail settings
Submitter Peter Maydell
Date Feb. 22, 2012, 10:13 p.m.
Message ID <1329948791-24274-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/142543/
State New
Headers show

Comments

Peter Maydell - Feb. 22, 2012, 10:13 p.m.
Increase the width of the column used for the machine name in
the "-M ?" output from 10 to 20 spaces. This fixes the formatting
so it looks nice for architectures where a few of the machines
have overly long names. (Our current longest machine name is
"petalogix-s3adsp1800" with "realview-eb-mpcore" not far behind.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 vl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Stefan Hajnoczi - Feb. 23, 2012, 8:06 a.m.
On Wed, Feb 22, 2012 at 10:13:11PM +0000, Peter Maydell wrote:
> Increase the width of the column used for the machine name in
> the "-M ?" output from 10 to 20 spaces. This fixes the formatting
> so it looks nice for architectures where a few of the machines
> have overly long names. (Our current longest machine name is
> "petalogix-s3adsp1800" with "realview-eb-mpcore" not far behind.)
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  vl.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Confirmed that libvirt does not depend on the spacing.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/vl.c b/vl.c
index 7a8cc08..f211c71 100644
--- a/vl.c
+++ b/vl.c
@@ -1999,9 +1999,9 @@  static QEMUMachine *machine_parse(const char *name)
     printf("Supported machines are:\n");
     for (m = first_machine; m != NULL; m = m->next) {
         if (m->alias) {
-            printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name);
+            printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
         }
-        printf("%-10s %s%s\n", m->name, m->desc,
+        printf("%-20s %s%s\n", m->name, m->desc,
                m->is_default ? " (default)" : "");
     }
     exit(!name || *name != '?');