From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOQtb-0006cf-FR for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:07:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOQtU-0000xF-U1 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:07:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOQtU-0000ww-Ll for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:07:20 -0400 From: mrezanin@redhat.com Date: Fri, 14 Mar 2014 13:06:54 +0100 Message-Id: <1394798814-21279-1-git-send-email-mrezanin@redhat.com> Subject: [Qemu-devel] [PATCH v7] vl.c: Output error on invalid machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Miroslav Rezanina , armbru@redhat.com, afaerber@suse.de From: Miroslav Rezanina Output error message using qemu's error_report() function when user provides the invalid machine type on the command line. This also saves time to find what issue is when you downgrade from one version of qemu to another that doesn't support required machine type yet (the version user downgraded to have to have this patch applied too, of course). Signed-off-by: Miroslav Rezanina --- v7: - use -machine instead of -M in error help message - rebase to commit 0056ae2 v6: - print help instead of list supported machines on error --- vl.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 862cf20..cbd1381 100644 --- a/vl.c +++ b/vl.c @@ -2649,15 +2649,20 @@ static MachineClass *machine_parse(const char *name) if (mc) { return mc; } - printf("Supported machines are:\n"); - for (el = machines; el; el = el->next) { - MachineClass *mc = el->data; - QEMUMachine *m = mc->qemu_machine; - if (m->alias) { - printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name); + if (name && !is_help_option(name)) { + error_report("Unsupported machine type"); + printf("\nUse -machine help to list supported machines!\n"); + } else { + printf("Supported machines are:\n"); + for (el = machines; el; el = el->next) { + MachineClass *mc = el->data; + QEMUMachine *m = mc->qemu_machine; + 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)" : ""); } - printf("%-20s %s%s\n", m->name, m->desc, - m->is_default ? " (default)" : ""); } g_slist_free(machines); -- 1.8.5.3