[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/61] qcow2: Fix snapshot restoration in snapshot_cr
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 23/61] qcow2: Fix snapshot restoration in snapshot_create |
Date: |
Fri, 11 Oct 2013 17:05:13 +0200 |
From: Max Reitz <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [Qemu-devel] [PULL 13/61] qcow2: Always use error path on writing snapshots, (continued)
- [Qemu-devel] [PULL 13/61] qcow2: Always use error path on writing snapshots, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 14/61] qcow2: Free allocated snapshot table on error, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 16/61] block/get_block_status: avoid redundant callouts on raw devices, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 17/61] block: Add BlockDriver.bdrv_check_ext_snapshot., Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 15/61] qcow2: Assert against snapshot name/ID overflow, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 18/61] qemu-iotests: Discard preallocated zero clusters, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 19/61] ahci: set ahci mode on reset, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 21/61] qcow2: Add missing space in error message, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 20/61] block: qemu-iotests for vhdx, read sample dynamic image, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 22/61] qcow2: Remove wrong metadata overlap check, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 23/61] qcow2: Fix snapshot restoration in snapshot_create,
Kevin Wolf <=
- [Qemu-devel] [PULL 24/61] qcow2: Use better type for numerical snapshot ID, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 25/61] block: Improve driver whitelist checks, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 26/61] qcow2: Use negated overflow check mask, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 27/61] qcow2: Make overlap check mask variable, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 28/61] qcow2: Add overlap-check options, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 29/61] qcow2: Array assigning options to OL check bits, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 31/61] qcow2: Evaluate overlap check options, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 30/61] qcow2: Add more overlap check bitmask macros, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 32/61] block/raw_bsd: Employ error parameter, Kevin Wolf, 2013/10/11
- [Qemu-devel] [PULL 33/61] block/raw-win32: Employ error parameter, Kevin Wolf, 2013/10/11