From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45226 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNe1o-0007ED-Qe for qemu-devel@nongnu.org; Tue, 30 Nov 2010 23:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNUSY-00067V-JM for qemu-devel@nongnu.org; Tue, 30 Nov 2010 12:57:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNUSY-0005Qy-8s for qemu-devel@nongnu.org; Tue, 30 Nov 2010 12:57:46 -0500 From: Kevin Wolf Date: Tue, 30 Nov 2010 18:58:07 +0100 Message-Id: <1291139900-20329-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1291139900-20329-1-git-send-email-kwolf@redhat.com> References: <1291139900-20329-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 03/16] block migration: do not submit multiple AIOs for same sector (v2) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Marcelo Tosatti An old version of this patch was applied to master, so this contains the differences between v1 and v2. Signed-off-by: Marcelo Tosatti Signed-off-by: Kevin Wolf --- block-migration.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/block-migration.c b/block-migration.c index 3e66f49..1475325 100644 --- a/block-migration.c +++ b/block-migration.c @@ -146,8 +146,7 @@ static int bmds_aio_inflight(BlkMigDevState *bmds, int64_t sector) { int64_t chunk = sector / (int64_t)BDRV_SECTORS_PER_DIRTY_CHUNK; - if (bmds->aio_bitmap && - (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bmds->bs)) { + if ((sector << BDRV_SECTOR_BITS) < bdrv_getlength(bmds->bs)) { return !!(bmds->aio_bitmap[chunk / (sizeof(unsigned long) * 8)] & (1UL << (chunk % (sizeof(unsigned long) * 8)))); } else { @@ -169,13 +168,9 @@ static void bmds_set_aio_inflight(BlkMigDevState *bmds, int64_t sector_num, bit = start % (sizeof(unsigned long) * 8); val = bmds->aio_bitmap[idx]; if (set) { - if (!(val & (1UL << bit))) { - val |= 1UL << bit; - } + val |= 1UL << bit; } else { - if (val & (1UL << bit)) { - val &= ~(1UL << bit); - } + val &= ~(1UL << bit); } bmds->aio_bitmap[idx] = val; } @@ -385,8 +380,9 @@ static int mig_save_device_dirty(Monitor *mon, QEMUFile *f, int nr_sectors; for (sector = bmds->cur_dirty; sector < bmds->total_sectors;) { - if (bmds_aio_inflight(bmds, sector)) + if (bmds_aio_inflight(bmds, sector)) { qemu_aio_flush(); + } if (bdrv_get_dirty(bmds->bs, sector)) { if (total_sectors - sector < BDRV_SECTORS_PER_DIRTY_CHUNK) { -- 1.7.2.3