From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9x4B-0005Iz-Fs for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9x48-00031A-Oq for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46218) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9x48-00030x-KY for qemu-devel@nongnu.org; Fri, 18 Dec 2015 10:35:32 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 4BEFBC00126A for ; Fri, 18 Dec 2015 15:35:32 +0000 (UTC) From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:10 +0100 Message-Id: <1450452927-8346-8-git-send-email-armbru@redhat.com> In-Reply-To: <1450452927-8346-1-git-send-email-armbru@redhat.com> References: <1450452927-8346-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 07/24] qemu-nbd: Clean up "Failed to load snapshot" error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org bdrv_snapshot_load_tmp() sets an error and returns -errno on failure. We report both even though the error message is self-contained. Drop the redundant strerror(). While there: setting errno right before exit() is pointless, so drop that, too. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qemu-nbd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 706552e..b8be3bc 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -156,8 +156,7 @@ static int find_partition(BlockBackend *blk, int partition, int ret; if ((ret = blk_read(blk, 0, data, 1)) < 0) { - errno = -ret; - error_report("error while reading: %s", strerror(errno)); + error_report("error while reading: %s", strerror(-ret)); exit(EXIT_FAILURE); } @@ -178,8 +177,7 @@ static int find_partition(BlockBackend *blk, int partition, int j; if ((ret = blk_read(blk, mbr[i].start_sector_abs, data1, 1)) < 0) { - errno = -ret; - error_report("error while reading: %s", strerror(errno)); + error_report("error while reading: %s", strerror(-ret)); exit(EXIT_FAILURE); } @@ -721,9 +719,8 @@ int main(int argc, char **argv) &local_err); } if (ret < 0) { - errno = -ret; - error_report("Failed to load snapshot: %s: %s", - error_get_pretty(local_err), strerror(errno)); + error_report("Failed to load snapshot: %s", + error_get_pretty(local_err)); exit(EXIT_FAILURE); } @@ -738,9 +735,8 @@ int main(int argc, char **argv) if (partition != -1) { ret = find_partition(blk, partition, &dev_offset, &fd_size); if (ret < 0) { - errno = -ret; error_report("Could not find partition %d: %s", partition, - strerror(errno)); + strerror(-ret)); exit(EXIT_FAILURE); } } -- 2.4.3