[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/24] migration: Use error_reportf_err() instead
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 14/24] migration: Use error_reportf_err() instead of monitor_printf() |
Date: |
Fri, 18 Dec 2015 16:35:17 +0100 |
Both error_reportf_err() and monitor_printf() print to the same
destination when monitor_printf() is used correctly, i.e. within an
HMP monitor. Elsewhere, monitor_printf() does nothing, while
error_reportf_err() reports to stderr.
Both changed functions are HMP command handlers. These should only
run within an HMP monitor.
Unlike monitor_printf(), error_reportf_err() uses the error whole
instead of just its message obtained with error_get_pretty(). This
avoids suppressing its hint (see commit 50b7b00), but I don't think
the errors touched in this commit can come with hints.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
migration/savevm.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index e277b72..bcaeb70 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1927,10 +1927,9 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
/* Delete old snapshots of the same name */
if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) {
- monitor_printf(mon,
- "Error while deleting snapshot on device '%s': %s\n",
- bdrv_get_device_name(bs1), error_get_pretty(local_err));
- error_free(local_err);
+ error_reportf_err(local_err,
+ "Error while deleting snapshot on device '%s': ",
+ bdrv_get_device_name(bs1));
return;
}
@@ -2108,10 +2107,9 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
const char *name = qdict_get_str(qdict, "name");
if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
- monitor_printf(mon,
- "Error while deleting snapshot on device '%s': %s\n",
- bdrv_get_device_name(bs), error_get_pretty(err));
- error_free(err);
+ error_reportf_err(err,
+ "Error while deleting snapshot on device '%s': ",
+ bdrv_get_device_name(bs));
}
}
--
2.4.3
- [Qemu-devel] [PATCH v3 12/24] error: Use error_prepend() where it makes obvious sense, (continued)
- [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, 2015/12/18
- [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 <=
- [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
- [Qemu-devel] [PATCH v3 24/24] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 11/24] error: Use error_reportf_err() where it makes obvious sense, Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 21/24] error: Clean up errors with embedded newlines (again), Markus Armbruster, 2015/12/18
- [Qemu-devel] [PATCH v3 20/24] vhdx: Fix "log that needs to be replayed" error message, Markus Armbruster, 2015/12/18