Skip to content

Commit

Permalink
vl: Use error_report() for --display errors
Browse files Browse the repository at this point in the history
Results in nicer error messages.  Before this patch:

    Invalid GTK option string: gtk,lirum-larum

After:

    qemu-system-x86_64: -display gtk,lirum-larum: Invalid GTK option string

Of course, the thing ought to use QemuOpts instead of parsing by hand.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
  • Loading branch information
Markus Armbruster committed Jun 22, 2015
1 parent 1459407 commit c6bf0f7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2098,13 +2098,13 @@ static DisplayType select_display(const char *p)
}
} else {
invalid_sdl_args:
fprintf(stderr, "Invalid SDL option string: %s\n", p);
error_report("Invalid SDL option string");
exit(1);
}
opts = nextopt;
}
#else
fprintf(stderr, "SDL support is disabled\n");
error_report("SDL support is disabled");
exit(1);
#endif
} else if (strstart(p, "vnc", &opts)) {
Expand All @@ -2115,18 +2115,18 @@ static DisplayType select_display(const char *p)
exit(1);
}
} else {
fprintf(stderr, "VNC requires a display argument vnc=<display>\n");
error_report("VNC requires a display argument vnc=<display>");
exit(1);
}
#else
fprintf(stderr, "VNC support is disabled\n");
error_report("VNC support is disabled");
exit(1);
#endif
} else if (strstart(p, "curses", &opts)) {
#ifdef CONFIG_CURSES
display = DT_CURSES;
#else
fprintf(stderr, "Curses support is disabled\n");
error_report("Curses support is disabled");
exit(1);
#endif
} else if (strstart(p, "gtk", &opts)) {
Expand Down Expand Up @@ -2155,19 +2155,19 @@ static DisplayType select_display(const char *p)
}
} else {
invalid_gtk_args:
fprintf(stderr, "Invalid GTK option string: %s\n", p);
error_report("Invalid GTK option string");
exit(1);
}
opts = nextopt;
}
#else
fprintf(stderr, "GTK support is disabled\n");
error_report("GTK support is disabled");
exit(1);
#endif
} else if (strstart(p, "none", &opts)) {
display = DT_NONE;
} else {
fprintf(stderr, "Unknown display type: %s\n", p);
error_report("Unknown display type");
exit(1);
}

Expand Down

0 comments on commit c6bf0f7

Please sign in to comment.