From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9SK-00063Y-GP for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9SJ-0004gL-0f for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:10:56 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:45305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9SI-0004g3-OR for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:10:54 -0400 Received: by pbbro12 with SMTP id ro12so9213697pbb.4 for ; Tue, 05 Jun 2012 23:10:52 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 6 Jun 2012 08:10:39 +0200 Message-Id: <1338963044-21445-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1338963044-21445-1-git-send-email-pbonzini@redhat.com> References: <1338963044-21445-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] blkdebug: remove sync i/o events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com These are unused, except (by mistake more or less) in QED. Signed-off-by: Paolo Bonzini --- block.h | 2 -- block/blkdebug.c | 2 -- block/qed.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/block.h b/block.h index bff5a9b..80c1768 100644 --- a/block.h +++ b/block.h @@ -391,9 +391,7 @@ typedef enum { BLKDBG_L2_ALLOC_COW_READ, BLKDBG_L2_ALLOC_WRITE, - BLKDBG_READ, BLKDBG_READ_AIO, - BLKDBG_READ_BACKING, BLKDBG_READ_BACKING_AIO, BLKDBG_READ_COMPRESSED, diff --git a/block/blkdebug.c b/block/blkdebug.c index e56e37d..1eff940 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -147,9 +147,7 @@ static const char *event_names[BLKDBG_EVENT_MAX] = { [BLKDBG_L2_ALLOC_COW_READ] = "l2_alloc.cow_read", [BLKDBG_L2_ALLOC_WRITE] = "l2_alloc.write", - [BLKDBG_READ] = "read", [BLKDBG_READ_AIO] = "read_aio", - [BLKDBG_READ_BACKING] = "read_backing", [BLKDBG_READ_BACKING_AIO] = "read_backing_aio", [BLKDBG_READ_COMPRESSED] = "read_compressed", diff --git a/block/qed.c b/block/qed.c index ab59724..dd2832a 100644 --- a/block/qed.c +++ b/block/qed.c @@ -748,7 +748,7 @@ static void qed_read_backing_file(BDRVQEDState *s, uint64_t pos, /* If the read straddles the end of the backing file, shorten it */ size = MIN((uint64_t)backing_length - pos, qiov->size); - BLKDBG_EVENT(s->bs->file, BLKDBG_READ_BACKING); + BLKDBG_EVENT(s->bs->file, BLKDBG_READ_BACKING_AIO); bdrv_aio_readv(s->bs->backing_hd, pos / BDRV_SECTOR_SIZE, qiov, size / BDRV_SECTOR_SIZE, cb, opaque); } -- 1.7.10.1