From patchwork Thu Oct 28 14:23:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 69466 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 7CC88B6F11 for ; Fri, 29 Oct 2010 01:25:22 +1100 (EST) Received: from localhost ([127.0.0.1]:57484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBTPo-0003B4-Q4 for incoming@patchwork.ozlabs.org; Thu, 28 Oct 2010 10:25:16 -0400 Received: from [140.186.70.92] (port=34306 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBTNg-0002Hb-Di for qemu-devel@nongnu.org; Thu, 28 Oct 2010 10:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBTNZ-0000nD-W2 for qemu-devel@nongnu.org; Thu, 28 Oct 2010 10:23:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBTNZ-0000n3-P9 for qemu-devel@nongnu.org; Thu, 28 Oct 2010 10:22:57 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9SEMuIN014787 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Oct 2010 10:22:57 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9SEMttT003732; Thu, 28 Oct 2010 10:22:55 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Thu, 28 Oct 2010 16:23:40 +0200 Message-Id: <1288275820-11267-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH] qcow2: Invalidate cache after failed read 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 The cache content may be destroyed after a failed read, better not use it any more. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 4f7dc59..b040208 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -188,6 +188,7 @@ static int l2_load(BlockDriverState *bs, uint64_t l2_offset, ret = bdrv_pread(bs->file, l2_offset, *l2_table, s->l2_size * sizeof(uint64_t)); if (ret < 0) { + qcow2_l2_cache_reset(bs); return ret; } diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 0efb676..a10453c 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -103,6 +103,7 @@ static int load_refcount_block(BlockDriverState *bs, ret = bdrv_pread(bs->file, refcount_block_offset, s->refcount_block_cache, s->cluster_size); if (ret < 0) { + s->refcount_block_cache_offset = 0; return ret; }