david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error: Use error_report_err() instead of ad hoc prints

Browse Source 
Unlike ad hoc prints, error_report_err() uses the error whole instead
of just its message obtained with error_get_pretty().  This avoids
suppressing its hint (see commit 50b7b00).  Example:

    $ bld/ivshmem-server -l 42@
    Parameter 'shm_size' expects a size
    You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes.

The last line is new with this patch.

While there, drop a "cannot parse shm size: " message prefix; it's
redundant, because the error message proper is always of the form
"Parameter 'shm_size' expects ...".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-5-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:07 +01:00
parent 193227f9e5
commit 7828867198
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ivshmem-server/main.c
View File

@ -106,9 +106,7 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int argc, char *argv[])
case 'l': /* shm_size */ case 'l': /* shm_size */
parse_option_size("shm_size", optarg, &args->shm_size, &errp); parse_option_size("shm_size", optarg, &args->shm_size, &errp);
if (errp) { if (errp) {
fprintf(stderr, "cannot parse shm size: %s\n", error_report_err(errp);
error_get_pretty(errp));
error_free(errp);
ivshmem_server_usage(argv[0], 1); ivshmem_server_usage(argv[0], 1);
} }
break; break;

3
qdev-monitor.c
View File

@ -266,8 +266,7 @@ int qdev_device_help(QemuOpts *opts)
return 1; return 1;
error: error:
error_printf("%s\n", error_get_pretty(local_err)); error_report_err(local_err);
error_free(local_err);
return 1; return 1;
} }

3
qemu-nbd.c
View File

@ -251,8 +251,7 @@ static void *nbd_client_thread(void *arg)
&size, &local_error); &size, &local_error);
if (ret < 0) { if (ret < 0) {
if (local_error) { if (local_error) {
fprintf(stderr, "%s\n", error_get_pretty(local_error)); error_report_err(local_error);
error_free(local_error);
} }
goto out_socket; goto out_socket;
} }