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>

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 33e245e12fd62e954f300ee8894f50aa84d6a64e..fffb58efb36f1bdcefeea61dc3459075857606a0 100644 (file)
--- 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 3d48b4f00e00e098cd728d363842c54e6f426f16..f4f5540b87735e6a8d0b58360eb835e6b7ea3c9a 100644 (file)
--- 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 e188d8c13d0f2080eec3d9f26c5ae22a65365318..f0b447ea420aeb48a77d592899601a61a754f7ec 100644 (file)
--- 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 6a0b9813f5dacb11018bf2eee29630416c2223d7..153b8f5870f70d094449bc738f0d7140512ae268 100644 (file)
--- 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);