From patchwork Fri Feb 24 14:00:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 142844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 32963B7022 for ; Sat, 25 Feb 2012 01:01:43 +1100 (EST) Received: from localhost ([::1]:36031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0viF-0007M5-VP for incoming@patchwork.ozlabs.org; Fri, 24 Feb 2012 09:01:31 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0vhj-00060J-95 for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0vhd-0007cl-6C for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:00:59 -0500 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:48000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0vhc-0007cV-Ne for qemu-devel@nongnu.org; Fri, 24 Feb 2012 09:00:53 -0500 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Feb 2012 14:00:51 -0000 Received: from d06nrmr1707.portsmouth.uk.ibm.com (9.149.39.225) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 24 Feb 2012 14:00:48 -0000 Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q1OE0l9G2597092 for ; Fri, 24 Feb 2012 14:00:47 GMT Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q1OE0knk026338 for ; Fri, 24 Feb 2012 14:00:47 GMT Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31] (may be forged)) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q1OE0kEb026334; Fri, 24 Feb 2012 14:00:46 GMT From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 24 Feb 2012 14:00:40 +0000 Message-Id: <1330092041-13801-3-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1330092041-13801-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1330092041-13801-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12022414-6892-0000-0000-00000119F3AA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.114 Cc: Peter Maydell , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/3] vl.c: Increase width of machine name column in "-M ?" output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Maydell 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 Signed-off-by: Stefan Hajnoczi --- vl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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 != '?');