From patchwork Mon Sep 7 09:23:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liran Schour X-Patchwork-Id: 33070 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id C9A3DB6F31 for ; Mon, 7 Sep 2009 19:01:16 +1000 (EST) Received: from localhost ([127.0.0.1]:46704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mka63-0000aL-0u for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2009 05:01:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mka2u-0008FZ-1s for qemu-devel@nongnu.org; Mon, 07 Sep 2009 04:57:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mka2p-0008Dp-0G for qemu-devel@nongnu.org; Mon, 07 Sep 2009 04:57:55 -0400 Received: from [199.232.76.173] (port=33166 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mka2o-0008DU-1d for qemu-devel@nongnu.org; Mon, 07 Sep 2009 04:57:50 -0400 Received: from mtagate8.uk.ibm.com ([195.212.29.141]:52177) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mka2n-0002zB-EV for qemu-devel@nongnu.org; Mon, 07 Sep 2009 04:57:49 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate8.uk.ibm.com (8.14.3/8.13.8) with ESMTP id n878vRSX637042 for ; Mon, 7 Sep 2009 08:57:32 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n878vH5W2531536 for ; Mon, 7 Sep 2009 09:57:17 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n878vH1c016929 for ; Mon, 7 Sep 2009 09:57:17 +0100 Received: from localhost.localdomain (im4-64s.haifa.ibm.com [9.148.27.41]) by d06av02.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n878vGMf016906 for ; Mon, 7 Sep 2009 09:57:16 +0100 From: lirans@il.ibm.com To: qemu-devel@nongnu.org Date: Mon, 7 Sep 2009 12:23:09 +0300 Message-Id: <12523153891813-git-send-email-lirans@il.ibm.com> X-Mailer: git-send-email 1.5.2.4 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.0.3x (2) Subject: [Qemu-devel] [PATCH 1/3] Expose a mechanisem to trace block writes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To support live migration without shared storage we need to be able to trace writes to disk while migrating. This Patch expose handler registration for above components to be notified about block writes. diff --git a/block.c b/block.c index cefbe77..b13da08 100644 --- a/block.c +++ b/block.c @@ -63,6 +63,8 @@ BlockDriverState *bdrv_first; static BlockDriver *first_drv; +static BlockDriverDirtyHandler *bdrv_dirty_handler = NULL; + int path_is_absolute(const char *path) { const char *p; @@ -613,6 +615,10 @@ int bdrv_write(BlockDriverState *bs, int64_t sector_num, if (bdrv_check_request(bs, sector_num, nb_sectors)) return -EIO; + if(bdrv_dirty_handler != NULL) { + bdrv_dirty_handler(bs, sector_num, nb_sectors); + } + return drv->bdrv_write(bs, sector_num, buf, nb_sectors); } @@ -1144,6 +1150,11 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, return -ENOTSUP; if (bdrv_check_request(bs, sector_num, nb_sectors)) return -EIO; + + if(bdrv_dirty_handler != NULL) { + bdrv_dirty_handler(bs, sector_num, nb_sectors); + } + return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors); } @@ -1338,7 +1349,11 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num, return NULL; if (bdrv_check_request(bs, sector_num, nb_sectors)) return NULL; - + + if(bdrv_dirty_handler != NULL) { + bdrv_dirty_handler(bs, sector_num, nb_sectors); + } + ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors, cb, opaque); @@ -1632,6 +1647,17 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs, return NULL; } +void register_bdrv_dirty_tracking(BlockDriverDirtyHandler *dirty_handler) +{ + bdrv_dirty_handler = dirty_handler; +} + +void unregister_bdrv_dirty_tracking(void) +{ + bdrv_dirty_handler = NULL; +} + + void *qemu_blockalign(BlockDriverState *bs, size_t size) { return qemu_memalign((bs && bs->buffer_alignment) ? bs->buffer_alignment : 512, size); diff --git a/block.h b/block.h index 71e87fc..7f7db12 100644 --- a/block.h +++ b/block.h @@ -79,6 +79,8 @@ void bdrv_register(BlockDriver *bdrv); typedef struct BlockDriverAIOCB BlockDriverAIOCB; typedef void BlockDriverCompletionFunc(void *opaque, int ret); +typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector, + int sector_num); BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *iov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); @@ -165,4 +167,7 @@ int bdrv_put_buffer(BlockDriverState *bs, const uint8_t *buf, int bdrv_get_buffer(BlockDriverState *bs, uint8_t *buf, int64_t pos, int size); +void register_bdrv_dirty_tracking(BlockDriverDirtyHandler *dirty_handler); +void unregister_bdrv_dirty_tracking(void); + #endif diff --git a/block_int.h b/block_int.h index 830b7e9..c066485 100644 --- a/block_int.h +++ b/block_int.h @@ -156,6 +156,7 @@ struct BlockDriverState { int cyls, heads, secs, translation; int type; char device_name[32]; + void *dirty_control; BlockDriverState *next; void *private; };