From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkr-0003tI-1a for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9bkp-0007Y4-Gm for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9bkp-0007Xs-Cf for qemu-devel@nongnu.org; Thu, 17 Dec 2015 11:50:11 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 03745C0B7E1F for ; Thu, 17 Dec 2015 16:50:11 +0000 (UTC) Received: from blackfin.pond.sub.org ([10.3.113.12]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBHGo8CF005165 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 17 Dec 2015 11:50:10 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 17:49:51 +0100 Message-Id: <1450371004-26866-11-git-send-email-armbru@redhat.com> In-Reply-To: <1450371004-26866-1-git-send-email-armbru@redhat.com> References: <1450371004-26866-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 10/23] error: Don't decorate original error message when adding to it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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 033011c..ea8c84d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2436,7 +2436,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