[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/19] migration/block: fix pending() return value
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 19/19] migration/block: fix pending() return value |
Date: |
Mon, 5 Jan 2015 11:51:36 +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 09/19] block: Relative backing file for image creation, (continued)
- [Qemu-devel] [PULL 09/19] block: Relative backing file for image creation, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 07/19] block: Get full backing filename from string, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 12/19] qapi: Fix document for BlockStats.node-name, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 10/19] block/vmdk: Relative backing file for creation, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 11/19] iotests: Add test for relative backing file names, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 13/19] block: fix spoiling all dirty bitmaps by mirror and migration, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 16/19] block: Add blockdev-backup to transaction, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 14/19] qapi: Comment version info in TransactionAction, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 15/19] qmp: Add command 'blockdev-backup', Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 17/19] qemu-iotests: Test blockdev-backup in 055, Stefan Hajnoczi, 2015/01/05
- [Qemu-devel] [PULL 19/19] migration/block: fix pending() return value,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 18/19] iotests: Filter out "I/O thread spun..." warning, Stefan Hajnoczi, 2015/01/05
- Re: [Qemu-devel] [PULL 00/19] Block patches, Stefan Hajnoczi, 2015/01/05