From patchwork Tue Jun 15 14:19:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 55686 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A328DB7D48 for ; Wed, 16 Jun 2010 00:50:26 +1000 (EST) Received: from localhost ([127.0.0.1]:53362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOXT5-000675-Nv for incoming@patchwork.ozlabs.org; Tue, 15 Jun 2010 10:50:23 -0400 Received: from [140.186.70.92] (port=37724 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOWzj-0007yO-Da for qemu-devel@nongnu.org; Tue, 15 Jun 2010 10:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOWzi-00006F-AS for qemu-devel@nongnu.org; Tue, 15 Jun 2010 10:20:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4754) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOWzi-000067-3q for qemu-devel@nongnu.org; Tue, 15 Jun 2010 10:20:02 -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 o5FEJx0h002943 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jun 2010 10:19:59 -0400 Received: from localhost.localdomain (dhcp-5-217.str.redhat.com [10.32.5.217]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5FEJq6r025060; Tue, 15 Jun 2010 10:19:58 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 15 Jun 2010 16:19:26 +0200 Message-Id: <1276611581-3757-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1276611581-3757-1-git-send-email-kwolf@redhat.com> References: <1276611581-3757-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 04/19] qcow2: Return real error code in load_refcount_block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }