From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53519 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ04x-0006UA-K4 for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ04w-0001T4-AG for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36912) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ04w-0001Sr-3d for qemu-devel@nongnu.org; Wed, 14 Jul 2010 07:24:42 -0400 From: Kevin Wolf Date: Wed, 14 Jul 2010 13:24:06 +0200 Message-Id: <1279106653-24351-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1279106653-24351-1-git-send-email-kwolf@redhat.com> References: <1279106653-24351-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE][PATCH 07/14] qcow2: Restore L1 entry on l2_allocate failure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aurelien@aurel32.net Cc: kwolf@redhat.com, qemu-devel@nongnu.org If writing the L1 table to disk failed, we need to restore its old content in memory to avoid inconsistencies. Reported-by: Juan Quintela Signed-off-by: Kevin Wolf (cherry picked from commit 68dba0bf455e60061bb3c9c40ef0d82916372664) --- block/qcow2-cluster.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index b7a5b35..8c67e3c 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -266,6 +266,7 @@ static uint64_t *l2_allocate(BlockDriverState *bs, int l1_index) return l2_table; fail: + s->l1_table[l1_index] = old_l2_offset; qcow2_l2_cache_reset(bs); return NULL; } -- 1.7.1.1