From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO4TU-0000YN-1v for qemu-devel@nongnu.org; Fri, 05 Apr 2013 07:06:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO4TS-0002bo-9r for qemu-devel@nongnu.org; Fri, 05 Apr 2013 07:06:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO4RX-0001ju-RE for qemu-devel@nongnu.org; Fri, 05 Apr 2013 07:04:28 -0400 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 (8.14.4/8.14.4) with ESMTP id r35B4RpB009959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Apr 2013 07:04:27 -0400 From: Kevin Wolf Date: Fri, 5 Apr 2013 13:04:20 +0200 Message-Id: <1365159861-21305-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1365159861-21305-1-git-send-email-kwolf@redhat.com> References: <1365159861-21305-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] qcow2: Return real error in qcow2_update_snapshot_refcount List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com This fixes the error message triggered by the following script: cat > /tmp/blkdebug.cfg < --- block/qcow2-refcount.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index c38e970..4799681 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -747,10 +747,9 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (l1_table_offset != s->l1_table_offset) { l1_table = g_malloc0(align_offset(l1_size2, 512)); l1_allocated = 1; - if (bdrv_pread(bs->file, l1_table_offset, - l1_table, l1_size2) != l1_size2) - { - ret = -EIO; + + ret = bdrv_pread(bs->file, l1_table_offset, l1_table, l1_size2); + if (ret < 0) { goto fail; } @@ -802,7 +801,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, } if (refcount < 0) { - ret = -EIO; + ret = refcount; goto fail; } } @@ -833,7 +832,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, refcount = get_refcount(bs, l2_offset >> s->cluster_bits); } if (refcount < 0) { - ret = -EIO; + ret = refcount; goto fail; } else if (refcount == 1) { l2_offset |= QCOW_OFLAG_COPIED; -- 1.8.1.4