From patchwork Sun Jan 5 19:43:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 307091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E3732C00C4 for ; Mon, 6 Jan 2014 14:48:38 +1100 (EST) Received: from localhost ([::1]:60498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W01B5-0007B3-N1 for incoming@patchwork.ozlabs.org; Sun, 05 Jan 2014 22:48:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W016P-0001je-IT for qemu-devel@nongnu.org; Sun, 05 Jan 2014 22:43:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W016G-0001H8-KO for qemu-devel@nongnu.org; Sun, 05 Jan 2014 22:43:45 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:54522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W016F-0001GT-Ut for qemu-devel@nongnu.org; Sun, 05 Jan 2014 22:43:36 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Jan 2014 09:13:33 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Jan 2014 09:13:31 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 458CF3940023 for ; Mon, 6 Jan 2014 09:13:31 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s063hQDt53084260 for ; Mon, 6 Jan 2014 09:13:26 +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 s063hUvh022939 for ; Mon, 6 Jan 2014 09:13:31 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s063hHUh022368; Mon, 6 Jan 2014 09:13:29 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 6 Jan 2014 03:43:10 +0800 Message-Id: <1388950991-30105-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1388950991-30105-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1388950991-30105-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14010603-8878-0000-0000-00000A57768B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.7 Cc: kwolf@redhat.com, peter.crosthwaite@xilinx.com, jcody@redhat.com, mreitz@redhat.com, stefanha@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V9 7/8] blkdebug: add debug events for snapshot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 957be2c..9c801fb 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -186,6 +186,10 @@ static const char *event_names[BLKDBG_EVENT_MAX] = { [BLKDBG_FLUSH_TO_OS] = "flush_to_os", [BLKDBG_FLUSH_TO_DISK] = "flush_to_disk", + + [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 29ba534..8a143e7 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 36efaea..8901683 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -515,6 +515,10 @@ typedef enum { BLKDBG_FLUSH_TO_OS, BLKDBG_FLUSH_TO_DISK, + BLKDBG_SNAPSHOT_L1_UPDATE, + BLKDBG_SNAPSHOT_LIST_UPDATE, + BLKDBG_SNAPSHOT_HEADER_UPDATE, + BLKDBG_EVENT_MAX, } BlkDebugEvent;