From patchwork Wed Jul 14 11:24:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 58873 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 64586B6F0C for ; Wed, 14 Jul 2010 21:33:45 +1000 (EST) Received: from localhost ([127.0.0.1]:40855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ0De-0003e4-7Y for incoming@patchwork.ozlabs.org; Wed, 14 Jul 2010 07:33:42 -0400 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 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 o6EBOW4A005165 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Jul 2010 07:24:32 -0400 Received: from dhcp-5-188.str.redhat.com (vpn2-8-54.ams2.redhat.com [10.36.8.54]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6EBOFBk023208; Wed, 14 Jul 2010 07:24:30 -0400 From: Kevin Wolf To: aurelien@aurel32.net 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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] [STABLE][PATCH 07/14] qcow2: Restore L1 entry on l2_allocate failure 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 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; }