From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUzpC-0006w9-4P for qemu-devel@nongnu.org; Mon, 09 Mar 2015 11:42:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUzp8-0002AJ-Ux for qemu-devel@nongnu.org; Mon, 09 Mar 2015 11:42:34 -0400 From: Kevin Wolf Date: Mon, 9 Mar 2015 16:41:54 +0100 Message-Id: <1425915718-25138-10-git-send-email-kwolf@redhat.com> In-Reply-To: <1425915718-25138-1-git-send-email-kwolf@redhat.com> References: <1425915718-25138-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 69/73] sheepdog: Fix misleading error messages in sd_snapshot_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster If do_sd_create() fails, it first reports the error returned, then reports a another one with strerror(errno). errno is meaningless at that point. Report just one error combining the valid information from both messages. Reported-by: Eric Blake Signed-off-by: Markus Armbruster Reviewed-by: Liu Yuan Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/sheepdog.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 60a4853..c14172c 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2339,9 +2339,8 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) ret = do_sd_create(s, &new_vid, 1, &local_err); if (ret < 0) { - error_report_err(local_err); - error_report("failed to create inode for snapshot. %s", - strerror(errno)); + error_report("failed to create inode for snapshot: %s", + error_get_pretty(local_err)); goto cleanup; } -- 1.8.3.1