From patchwork Fri Feb 24 19:36:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 142965 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 536ABB6EF1 for ; Sat, 25 Feb 2012 06:37:04 +1100 (EST) Received: from localhost ([::1]:60747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S10wp-00052q-H0 for incoming@patchwork.ozlabs.org; Fri, 24 Feb 2012 14:36:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S10wa-0004h5-VZ for qemu-devel@nongnu.org; Fri, 24 Feb 2012 14:36:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S10wZ-0003WK-VC for qemu-devel@nongnu.org; Fri, 24 Feb 2012 14:36:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S10wZ-0003WB-Nj for qemu-devel@nongnu.org; Fri, 24 Feb 2012 14:36:39 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1OJacB0011997 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 24 Feb 2012 14:36:38 -0500 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q1OJabS9001126; Fri, 24 Feb 2012 14:36:37 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 24 Feb 2012 17:36:28 -0200 Message-Id: <1330112189-29280-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1330112189-29280-1-git-send-email-lcapitulino@redhat.com> References: <1330112189-29280-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 2/3] boards: introduce machine_print_all() 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 It prints all registered machine types. Signed-off-by: Luiz Capitulino --- vl.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/vl.c b/vl.c index 728eb36..ced7068 100644 --- a/vl.c +++ b/vl.c @@ -1198,6 +1198,20 @@ QEMUMachine *find_default_machine(void) return NULL; } +static void machine_print_all(void) +{ + QEMUMachine *m; + + printf("Supported machines are:\n"); + for (m = first_machine; m != NULL; m = m->next) { + if (m->alias) { + printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name); + } + printf("%-20s %s%s\n", m->name, m->desc, + m->is_default ? " (default)" : ""); + } +} + /***********************************************************/ /* main execution loop */ @@ -1992,7 +2006,7 @@ static int debugcon_parse(const char *devname) static QEMUMachine *machine_parse(const char *name) { - QEMUMachine *m, *machine = NULL; + QEMUMachine *machine = NULL; if (name) { machine = find_machine(name); @@ -2000,14 +2014,7 @@ static QEMUMachine *machine_parse(const char *name) if (machine) { return machine; } - printf("Supported machines are:\n"); - for (m = first_machine; m != NULL; m = m->next) { - if (m->alias) { - printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name); - } - printf("%-20s %s%s\n", m->name, m->desc, - m->is_default ? " (default)" : ""); - } + machine_print_all(); exit(!name || *name != '?'); }