Skip to content

Commit

Permalink
vl.c: Output error on invalid machine type
Browse files Browse the repository at this point in the history
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 <[email protected]>
[Replace printf with error_printf, suggested by Markus Armbruster. - Paolo]
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
LaneWolf authored and bonzini committed Mar 17, 2014
1 parent 83d1c8a commit 025172d
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2651,15 +2651,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");
error_printf("Use -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);
Expand Down

0 comments on commit 025172d

Please sign in to comment.