From patchwork Wed Nov 13 05:24:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 290821 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 810722C00C1 for ; Wed, 13 Nov 2013 16:25:52 +1100 (EST) Received: from localhost ([::1]:46654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgSxY-00079N-UH for incoming@patchwork.ozlabs.org; Wed, 13 Nov 2013 00:25:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgSxB-00079I-Sj for qemu-devel@nongnu.org; Wed, 13 Nov 2013 00:25:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgSx2-0005oQ-KU for qemu-devel@nongnu.org; Wed, 13 Nov 2013 00:25:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgSx2-0005oL-Cn for qemu-devel@nongnu.org; Wed, 13 Nov 2013 00:25:16 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAD5PF0m022265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Nov 2013 00:25:15 -0500 Received: from amosk.info.com ([10.66.7.115]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAD5P8oW029576; Wed, 13 Nov 2013 00:25:11 -0500 From: Amos Kong To: qemu-devel@nongnu.org Date: Wed, 13 Nov 2013 13:24:56 +0800 Message-Id: <1384320296-22812-1-git-send-email-akong@redhat.com> In-Reply-To: <1384315458-23417-1-git-send-email-famz@redhat.com> References: <1384315458-23417-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, famz@redhat.com Subject: [Qemu-devel] [PATCH] qemu-img: re-assign ret after reporting original error 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 Currently the output error is always: strerror(-4) -> Unknown error -4 This patch moves ret assignment after reporting original error. Signed-off-by: Amos Kong --- qemu-img.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 926f0a0..1fd664f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1045,9 +1045,9 @@ static int img_compare(int argc, char **argv) } if (ret) { if (ret < 0) { - ret = 4; error_report("Error while reading offset %" PRId64 ": %s", sectors_to_bytes(sector_num), strerror(-ret)); + ret = 4; } goto out; }