[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/24] error: Use error_report_err() instead of a
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 04/24] error: Use error_report_err() instead of ad hoc prints |
Date: |
Fri, 18 Dec 2015 16:35:07 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
contrib/ivshmem-server/main.c | 4 +---
qdev-monitor.c | 3 +--
qemu-nbd.c | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index 54ff001..00508b5 100644
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -106,9 +106,7 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int
argc, char *argv[])
case 'l': /* shm_size */
parse_option_size("shm_size", optarg, &args->shm_size, &errp);
if (errp) {
- fprintf(stderr, "cannot parse shm size: %s\n",
- error_get_pretty(errp));
- error_free(errp);
+ error_report_err(errp);
ivshmem_server_usage(argv[0], 1);
}
break;
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 30936df..3ce4710 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -266,8 +266,7 @@ int qdev_device_help(QemuOpts *opts)
return 1;
error:
- error_printf("%s\n", error_get_pretty(local_err));
- error_free(local_err);
+ error_report_err(local_err);
return 1;
}
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 65c0ebd..706552e 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -251,8 +251,7 @@ static void *nbd_client_thread(void *arg)
&size, &local_error);
if (ret < 0) {
if (local_error) {
- fprintf(stderr, "%s\n", error_get_pretty(local_error));
- error_free(local_error);
+ error_report_err(local_error);
}
goto out_socket;
}
--
2.4.3
- [Qemu-devel] [PATCH v3 00/24] Error reporting cleanups and fixes, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 18/24] vmdk: Clean up "Invalid extent lines" error message, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 19/24] pci-assign: Clean up "Failed to assign" error messages, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 13/24] spapr: Use error_reportf_err(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 17/24] vmdk: Clean up control flow in vmdk_parse_extents() a bit, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 15/24] qemu-io qemu-nbd: Use error_report() etc. instead of fprintf(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 02/24] error: Use error_report_err() where appropriate (again), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 12/24] error: Use error_prepend() where it makes obvious sense, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 08/24] test-throttle: Simplify qemu_init_main_loop() error handling, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 07/24] qemu-nbd: Clean up "Failed to load snapshot" error message, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 04/24] error: Use error_report_err() instead of ad hoc prints,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 01/24] qemu-nbd: Replace BSDism <err.h> by error_report(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 09/24] error: New error_prepend(), error_reportf_err(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 10/24] error: Don't decorate original error message when adding to it, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 06/24] block: Clean up "Could not create temporary overlay" error message, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 03/24] error: Use error_report_err() instead of monitor_printf(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 16/24] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 14/24] migration: Use error_reportf_err() instead of monitor_printf(), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 22/24] hw/s390x: Rename local variables Error *l_err to just err, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 05/24] error: Improve documentation, Markus Armbruster, 2015/12/18