From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44795 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKU0q-0002nw-4Z for qemu-devel@nongnu.org; Fri, 04 Jun 2010 06:20:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKU0p-0007jU-8z for qemu-devel@nongnu.org; Fri, 04 Jun 2010 06:20:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26255) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKU0o-0007jK-Vx for qemu-devel@nongnu.org; Fri, 04 Jun 2010 06:20:27 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54AKQRN030480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 4 Jun 2010 06:20:26 -0400 From: Kevin Wolf Date: Fri, 4 Jun 2010 12:19:12 +0200 Message-Id: <1275646752-25763-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1275646752-25763-1-git-send-email-kwolf@redhat.com> References: <1275646752-25763-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qcow2: Return real error code in load_refcount_block List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com This fixes load_refcount_block which completely ignored the return value of write_refcount_block and always returned -EIO for bdrv_pwrite failure. Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 51948ae..41e1da9 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -93,14 +93,19 @@ static int load_refcount_block(BlockDriverState *bs, int ret; if (cache_refcount_updates) { - write_refcount_block(bs); + ret = write_refcount_block(bs); + if (ret < 0) { + return ret; + } } BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD); ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache, s->cluster_size); - if (ret != s->cluster_size) - return -EIO; + if (ret < 0) { + return ret; + } + s->refcount_block_cache_offset = refcount_block_offset; return 0; } -- 1.6.6.1