Eduardo Habkost <[email protected]> writes:
> * Use "\n" consistently in both error messages.
> * Simplify error message.
>
> Signed-off-by: Eduardo Habkost <[email protected]>
> ---
> vl.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 61e474b..55521a0 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2634,8 +2634,8 @@ static gint machine_class_cmp(gconstpointer a,
> gconstpointer b)
> return mc;
> }
> if (name && !is_help_option(name)) {
> - error_report("unsupported machine type");
> - error_printf("Use -machine help to list supported machines!\n");
> + error_report("unsupported machine type\n"
> + "Use -machine help to list supported machines");
error_report()'s contract:
/*
* Print an error message to current monitor if we have one, else to stderr.
* Format arguments like sprintf(). The result should not contain
* newlines.
* Prepend the current location and append a newline.
* It's wrong to call this in a QMP monitor. Use error_setg() there.
*/
The old code gets it right.
You could squash the removal of '!' into PATCH 03.
> } else {
> printf("Supported machines are:\n");
> machines = g_slist_sort(machines, machine_class_cmp);
> @@ -3994,8 +3994,8 @@ int main(int argc, char **argv, char **envp)
> }
>
> if (machine_class == NULL) {
> - error_report("No machine specified, and there is no default.\n"
> - "Use -machine help to list supported machines!");
> + error_report("no machine specified\n"
> + "Use -machine help to list supported machines");
> exit(1);
> }
Likewise.
