From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeIe-0007Xx-T4 for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:06:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUeIY-0005Lr-Ty for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:06:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUeIY-0005Jw-Fd for qemu-devel@nongnu.org; Fri, 11 Oct 2013 11:06:38 -0400 From: Kevin Wolf Date: Fri, 11 Oct 2013 17:05:13 +0200 Message-Id: <1381503951-27985-24-git-send-email-kwolf@redhat.com> In-Reply-To: <1381503951-27985-1-git-send-email-kwolf@redhat.com> References: <1381503951-27985-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 23/61] qcow2: Fix snapshot restoration in snapshot_create List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz If the new snapshot table could not be written in qcow2_snapshot_create, the old snapshot table has to be restored in memory and the new one released. This should include restoration of the old snapshot count as well, which is added by this patch. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block/qcow2-snapshot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 812dab2..fe7e14c 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -433,6 +433,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) if (ret < 0) { g_free(s->snapshots); s->snapshots = old_snapshot_list; + s->nb_snapshots--; goto fail; } -- 1.8.1.4