From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40515 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLdao-0007xG-DD for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:46:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLdan-0005sQ-2o for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:46:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51105) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLdam-0005sF-RH for qemu-devel@nongnu.org; Mon, 07 Jun 2010 10:46:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o57EkKaP016781 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Jun 2010 10:46:20 -0400 From: Kevin Wolf Date: Mon, 7 Jun 2010 16:46:05 +0200 Message-Id: <1275921965-11559-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 --- 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 03a9f25..5760ad6 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -285,6 +285,7 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) return 0; fail: + s->l1_table[l1_index] = old_l2_offset; qcow2_l2_cache_reset(bs); return ret; } -- 1.6.6.1