[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/41] error: Don't decorate original error message w
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it |
Date: |
Wed, 13 Jan 2016 16:43:24 +0100 |
Prepend the additional information, colon, space to the original
message without enclosing it in parenthesis or quotes, like we do
elsewhere.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
hw/core/qdev-properties.c | 2 +-
qemu-img.c | 2 +-
tests/test-aio.c | 2 +-
tests/test-thread-pool.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 33e245e..fffb58e 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1063,7 +1063,7 @@ static void qdev_prop_set_globals_for_type(DeviceState
*dev,
object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
if (err != NULL) {
assert(prop->user_provided);
- error_report("Warning: global %s.%s=%s ignored (%s)",
+ error_report("Warning: global %s.%s=%s ignored: %s",
prop->driver, prop->property, prop->value,
error_get_pretty(err));
error_free(err);
diff --git a/qemu-img.c b/qemu-img.c
index 3d48b4f..f4f5540 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2439,7 +2439,7 @@ static int img_snapshot(int argc, char **argv)
case SNAPSHOT_DELETE:
bdrv_snapshot_delete_by_id_or_name(bs, snapshot_name, &err);
if (err) {
- error_report("Could not delete snapshot '%s': (%s)",
+ error_report("Could not delete snapshot '%s': %s",
snapshot_name, error_get_pretty(err));
error_free(err);
ret = 1;
diff --git a/tests/test-aio.c b/tests/test-aio.c
index e188d8c..f0b447e 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -832,7 +832,7 @@ int main(int argc, char **argv)
ctx = aio_context_new(&local_error);
if (!ctx) {
- error_report("Failed to create AIO Context: '%s'",
+ error_report("Failed to create AIO Context: %s",
error_get_pretty(local_error));
error_free(local_error);
exit(1);
diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
index 6a0b981..153b8f5 100644
--- a/tests/test-thread-pool.c
+++ b/tests/test-thread-pool.c
@@ -229,7 +229,7 @@ int main(int argc, char **argv)
ctx = aio_context_new(&local_error);
if (!ctx) {
- error_report("Failed to create AIO Context: '%s'",
+ error_report("Failed to create AIO Context: %s",
error_get_pretty(local_error));
error_free(local_error);
exit(1);
--
2.4.3
- [Qemu-devel] [PULL 06/41] arm_mptimer: Don't use hw_error() in realize() method, (continued)
- [Qemu-devel] [PULL 06/41] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 14/41] isa: Clean up inappropriate hw_error(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 23/41] qemu-nbd: Clean up "Failed to load snapshot" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 12/41] isa: Trivially convert remaining PCI-ISA bridges to realize(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 16/41] xen-hvm: Mark inappropriate error handling FIXME, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 25/41] error: New error_prepend(), error_reportf_err(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 10/41] hw/arm/virt: Fix property "gic-version" error handling, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 29/41] spapr: Use error_reportf_err(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 41/41] checkpatch: Detect newlines in error_report and other error functions, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 33/41] vmdk: Clean up control flow in vmdk_parse_extents() a bit, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it,
Markus Armbruster <=
- [Qemu-devel] [PULL 32/41] error: Strip trailing '\n' from error string arguments (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 40/41] error: Consistently name Error * objects err, and not errp, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 22/41] block: Clean up "Could not create temporary overlay" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 27/41] error: Use error_reportf_err() where it makes obvious sense, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 30/41] migration: Use error_reportf_err() instead of monitor_printf(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 34/41] vmdk: Clean up "Invalid extent lines" error message, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 39/41] s390/sclp: Simplify control flow in sclp_realize(), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 37/41] error: Clean up errors with embedded newlines (again), Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 38/41] hw/s390x: Rename local variables Error *l_err to just err, Markus Armbruster, 2016/01/13
- [Qemu-devel] [PULL 04/41] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2016/01/13