From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6jT-0001uk-Es for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:22:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD6jK-0005Fm-CU for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:22:11 -0500 Received: from e28smtp02.in.ibm.com ([122.248.162.2]:50604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6jJ-0005E5-Dg for qemu-devel@nongnu.org; Tue, 11 Feb 2014 01:22:02 -0500 Received: from /spool/local by e28smtp02.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Feb 2014 11:51:51 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id D71301258059 for ; Tue, 11 Feb 2014 11:53:42 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1B6Ljri4587870 for ; Tue, 11 Feb 2014 11:51:45 +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 s1B6Lmud025809 for ; Tue, 11 Feb 2014 11:51:48 +0530 From: Wenchao Xia Date: Tue, 11 Feb 2014 14:23:07 -0500 Message-Id: <1392146588-12120-8-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1392146588-12120-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1392146588-12120-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V11 7/8] blkdebug: add debug events for snapshot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.crosthwaite@xilinx.com, jcody@redhat.com, mreitz@redhat.com, stefanha@redhat.com, Wenchao Xia Some code in qcow2-snapshot.c directly accesses bs->file, so in those places errors can't be injected by other events. Since the code in qcow2-snapshot.c is similar to the other qcow2 internal code (in regards to e.g. the L1 table), add some debug events. Signed-off-by: Wenchao Xia Reviewed-by: Max Reitz --- block/blkdebug.c | 4 ++++ block/qcow2-snapshot.c | 3 +++ include/block/block.h | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 56c4cd0..6a94dfd 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -194,6 +194,10 @@ static const char *event_names[BLKDBG_EVENT_MAX] = { [BLKDBG_PWRITEV] = "pwritev", [BLKDBG_PWRITEV_ZERO] = "pwritev_zero", [BLKDBG_PWRITEV_DONE] = "pwritev_done", + + [BLKDBG_SNAPSHOT_L1_UPDATE] = "snapshot_l1_update", + [BLKDBG_SNAPSHOT_LIST_UPDATE] = "snapshot_list_update", + [BLKDBG_SNAPSHOT_HEADER_UPDATE] = "snapshot_header_update", }; static int get_event_by_name(const char *name, BlkDebugEvent *event) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 12938a0..4746f80 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -209,6 +209,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs, } + BLKDBG_EVENT(bs->file, BLKDBG_SNAPSHOT_LIST_UPDATE); /* Write all snapshots to the new list */ for(i = 0; i < s->nb_snapshots; i++) { sn = s->snapshots + i; @@ -305,6 +306,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs, header_data.nb_snapshots = cpu_to_be32(s->nb_snapshots); header_data.snapshots_offset = cpu_to_be64(snapshots_offset); + BLKDBG_EVENT(bs->file, BLKDBG_SNAPSHOT_HEADER_UPDATE); ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots), &header_data, sizeof(header_data)); if (ret < 0) { @@ -475,6 +477,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, goto dealloc_l1_table; } + BLKDBG_EVENT(bs->file, BLKDBG_SNAPSHOT_L1_UPDATE); ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table, s->l1_size * sizeof(uint64_t)); if (ret < 0) { diff --git a/include/block/block.h b/include/block/block.h index 963a61f..25bcdad 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -535,6 +535,10 @@ typedef enum { BLKDBG_PWRITEV_ZERO, BLKDBG_PWRITEV_DONE, + BLKDBG_SNAPSHOT_L1_UPDATE, + BLKDBG_SNAPSHOT_LIST_UPDATE, + BLKDBG_SNAPSHOT_HEADER_UPDATE, + BLKDBG_EVENT_MAX, } BlkDebugEvent; -- 1.7.1