From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYq-0003R4-Jb for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVxYh-0003rF-LR for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:52:52 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:55058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYh-0003r7-0t for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:52:43 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 15 Oct 2013 11:22:40 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 8FFD9394003F for ; Tue, 15 Oct 2013 11:22:18 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9F5qZVN41943192 for ; Tue, 15 Oct 2013 11:22:35 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9F5qb3d000470 for ; Tue, 15 Oct 2013 11:22:37 +0530 From: Wenchao Xia Date: Tue, 15 Oct 2013 05:52:27 +0800 Message-Id: <1381787553-12497-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V4 0/6] qcow2: rollback the modification on fail in snapshot creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, mreitz@redhat.com, pbonzini@redhat.com, Wenchao Xia V2: 1: all fail case will goto fail section. 2: add the goto code. v3: Address Stefan's comments: 2: don't goto fail after allocation failure. 3: use sn->l1size correctly in qcow2_free_cluster(). 4-7: add test case to verify the error paths. Other: 1: new patch fix a existing bug, which will be exposed in error path test. v4: General change: rebased on upstream since error path for qcow2_write_snapshots() already exist in upstream. removed old patch 1 since it is fixed by Max in upstream. 5: moved the snapshot_l1_update event just before write operation, instead of before overlap check, since it is more straight. 6: remove a duplicated error path test about flush after snapshot list update, add a filter which replace number to X, since now in error in report detailed message including error cluster number. Address Stefan's comments: 1, 2, 4: add *errp to store detailed error message, instead of error_report() and compile time determined debug printf message. 3: do not free cluster when fail in header update for safety reason. Address Eric's comments: 1, 2, 4: add *errp to store detailed error message, instead of error_report() and compile time determined debug printf message. 5: squashed patches that add and use debug events. 6: added comments about test only on Linux. Wenchao Xia (6): 1 snapshot: add parameter *errp in snapshot create 2 qcow2: add error message in qcow2_write_snapshots() 3 qcow2: do not free clusters when fail in header update in qcow2_write_snapshots 4 qcow2: cancel the modification on fail in qcow2_snapshot_create() 5 blkdebug: add debug events for snapshot 6 qemu-iotests: add test for qcow2 snapshot block/blkdebug.c | 4 + block/qcow2-snapshot.c | 106 +++++++++++++++++-- block/qcow2.h | 4 +- block/rbd.c | 21 ++-- block/sheepdog.c | 29 ++++-- block/snapshot.c | 19 +++- blockdev.c | 10 +- include/block/block.h | 4 + include/block/block_int.h | 5 +- include/block/snapshot.h | 5 +- qemu-img.c | 10 +- savevm.c | 12 ++- tests/qemu-iotests/068 | 214 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/068.out | 35 ++++++ tests/qemu-iotests/common.filter | 7 ++ tests/qemu-iotests/group | 1 + 16 files changed, 431 insertions(+), 55 deletions(-) create mode 100755 tests/qemu-iotests/068 create mode 100644 tests/qemu-iotests/068.out