diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-18 16:35:13 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 15:16:17 +0100 |
| commit | 8aa802a6b768e811e492c7404a58c52ecfb382ed (patch) | |
| tree | d2d73d2fa9d75f051f63fd4cfa5e095e9a293652 | |
| parent | 8277d2aa58fe4f8f3ee394ea647ea652faf822a4 (diff) | |
| download | qemu-8aa802a6b768e811e492c7404a58c52ecfb382ed.tar.gz | |
error: Don't decorate original error message when adding to it
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-11-git-send-email-armbru@redhat.com>
| -rw-r--r-- | hw/core/qdev-properties.c | 2 | ||||
| -rw-r--r-- | qemu-img.c | 2 | ||||
| -rw-r--r-- | tests/test-aio.c | 2 | ||||
| -rw-r--r-- | 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 33e245e12f..fffb58efb3 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 3d48b4f00e..f4f5540b87 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 e188d8c13d..f0b447ea42 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 6a0b9813f5..153b8f5870 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); |