From patchwork Wed Jan 13 15:43:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 567013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EEF6D14032B for ; Thu, 14 Jan 2016 02:49:49 +1100 (AEDT) Received: from localhost ([::1]:37736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNgB-0007Xc-OJ for incoming@patchwork.ozlabs.org; Wed, 13 Jan 2016 10:49:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaT-0004Ab-5w for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJNaO-00018m-QO for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJNaO-00018H-KU for qemu-devel@nongnu.org; Wed, 13 Jan 2016 10:43:48 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 3EFEA349E5A for ; Wed, 13 Jan 2016 15:43:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-28.phx2.redhat.com [10.3.113.28]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0DFhj02015915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 13 Jan 2016 10:43:47 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 692353004F92; Wed, 13 Jan 2016 16:43:41 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 13 Jan 2016 16:43:24 +0100 Message-Id: <1452699819-26608-27-git-send-email-armbru@redhat.com> In-Reply-To: <1452699819-26608-1-git-send-email-armbru@redhat.com> References: <1452699819-26608-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 26/41] error: Don't decorate original error message when adding to it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 Reviewed-by: Eric Blake Message-Id: <1450452927-8346-11-git-send-email-armbru@redhat.com> --- 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);