[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 19/38] migration/block: fix pending() return value
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v3 19/38] migration/block: fix pending() return value |
Date: |
Tue, 13 Jan 2015 13:47:57 +0000 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Because of wrong return value of .save_live_pending() in
migration/block.c, migration finishes before the whole disk is
transferred. Such situation occurs when the migration process is fast
enough, 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>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
migration/block.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/block.c b/migration/block.c
index a0f908c..0c76106 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -766,8 +766,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();
--
2.1.0
- [Qemu-devel] [PULL v3 08/38] block: JSON filenames and relative backing files, (continued)
- [Qemu-devel] [PULL v3 08/38] block: JSON filenames and relative backing files, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 13/38] block: fix spoiling all dirty bitmaps by mirror and migration, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 11/38] iotests: Add test for relative backing file names, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 14/38] qapi: Comment version info in TransactionAction, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 12/38] qapi: Fix document for BlockStats.node-name, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 15/38] qmp: Add command 'blockdev-backup', Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 16/38] block: Add blockdev-backup to transaction, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 17/38] qemu-iotests: Test blockdev-backup in 055, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 18/38] iotests: Filter out "I/O thread spun..." warning, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 21/38] .gitignore: Ignore generated "common.env", Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 19/38] migration/block: fix pending() return value,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v3 22/38] qemu-iotests: Replace "/bin/true" with "true", Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 23/38] qemu-iotests: Add "_supported_os Linux" to 058, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 20/38] libqos: Convert malloc-pc allocator to a generic allocator, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 25/38] coroutine-ucontext: use __thread, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 24/38] qemu-iotests: Add supported os parameter for python tests, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 26/38] qemu-thread: add per-thread atexit functions, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 29/38] coroutine: rewrite pool to avoid mutex, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 30/38] coroutine: drop qemu_coroutine_adjust_pool_size, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 27/38] test-coroutine: avoid overflow on 32-bit systems, Stefan Hajnoczi, 2015/01/13
- [Qemu-devel] [PULL v3 28/38] QSLIST: add lock-free operations, Stefan Hajnoczi, 2015/01/13