[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] block-migration: fix pending() return value
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 2/9] block-migration: fix pending() return value |
Date: |
Thu, 11 Dec 2014 17:17:30 +0300 |
Because of wrong return value of .save_live_pending() in
block-migration, migration finishes before the whole disk
is transferred. Such situation occures when the migration
process is fast enouth, for example when source and dest
are on the same host.
If in the bulk phase we return something < max_size, we will skip
transferring the tail of the device. Currently we have "set pending to
BLOCK_SIZE if it is zero" for bulk phase, but there no guarantee, that
it will be < max_size.
True approach is to return, for example, max_size+1 when we are in the
bulk phase.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block-migration.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 6f3aa18..8df30d9 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -757,8 +757,8 @@ static uint64_t block_save_pending(QEMUFile *f, void
*opaque, uint64_t max_size)
block_mig_state.read_done * BLOCK_SIZE;
/* Report at least one block pending during bulk phase */
- if (pending == 0 && !block_mig_state.bulk_completed) {
- pending = BLOCK_SIZE;
+ if (pending <= max_size && !block_mig_state.bulk_completed) {
+ pending = max_size + BLOCK_SIZE;
}
blk_mig_unlock();
qemu_mutex_unlock_iothread();
--
1.9.1
- [Qemu-devel] [PATCH 0/8] Dirty bitmaps migration, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 1/9] block: rename bdrv_reset_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 2/9] block-migration: fix pending() return value,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 3/9] block: fix spoiling all dirty bitmaps by mirror and migration, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 6/9] block-migration: tiny refactoring, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 4/9] hbitmap: store / restore, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 5/9] block: BdrvDirtyBitmap store/restore interface, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 7/9] block-migration: remove not needed iothread lock, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 9/9] block-migration: add named dirty bitmaps migration, Vladimir Sementsov-Ogievskiy, 2014/12/11
- [Qemu-devel] [PATCH 8/9] migration: add dirty parameter, Vladimir Sementsov-Ogievskiy, 2014/12/11