[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/10] migration: Fixes for non-migratable RAMBlocks
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 02/10] migration: Fixes for non-migratable RAMBlocks |
Date: |
Fri, 15 Jun 2018 16:15:10 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
There are still a few cases where migration code is using the macros
and functions that do all RAMBlocks rather than just the migratable
blocks; fix those up.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 4 ++--
migration/rdma.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index a500015a2f..a7807cea84 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2516,7 +2516,7 @@ static void ram_state_resume_prepare(RAMState *rs,
QEMUFile *out)
* about dirty page logging as well.
*/
- RAMBLOCK_FOREACH(block) {
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
pages += bitmap_count_one(block->bmap,
block->used_length >> TARGET_PAGE_BITS);
}
@@ -3431,7 +3431,7 @@ static int ram_dirty_bitmap_sync_all(MigrationState *s,
RAMState *rs)
trace_ram_dirty_bitmap_sync_start();
- RAMBLOCK_FOREACH(block) {
+ RAMBLOCK_FOREACH_MIGRATABLE(block) {
qemu_savevm_send_recv_bitmap(file, block->idstr);
trace_ram_dirty_bitmap_request(block->idstr);
ramblock_count++;
diff --git a/migration/rdma.c b/migration/rdma.c
index 05aee3d591..8bd7159059 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -635,7 +635,7 @@ static int qemu_rdma_init_ram_blocks(RDMAContext *rdma)
assert(rdma->blockmap == NULL);
memset(local, 0, sizeof *local);
- qemu_ram_foreach_block(qemu_rdma_init_one_block, rdma);
+ qemu_ram_foreach_migratable_block(qemu_rdma_init_one_block, rdma);
trace_qemu_rdma_init_ram_blocks(local->nb_blocks);
rdma->dest_blocks = g_new0(RDMADestBlock,
rdma->local_ram_blocks.nb_blocks);
--
2.17.1
- [Qemu-devel] [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 01/10] typedefs: add QJSON, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 02/10] migration: Fixes for non-migratable RAMBlocks,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 03/10] migration: Poison ramblock loops in migration, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 04/10] migration/block-dirty-bitmap: fix dirty_bitmap_load, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 05/10] migration: fix counting xbzrle cache_miss_rate, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 06/10] migration: introduce migration_update_rates, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 09/10] migration/postcopy: Wake rate limit sleep on postcopy request, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 07/10] migration/postcopy: Add max-postcopy-bandwidth parameter, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 08/10] migration: Wake rate limiting for urgent requests, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 10/10] migration: calculate expected_downtime with ram_bytes_remaining(), Dr. David Alan Gilbert (git), 2018/06/15
- Re: [Qemu-devel] [PULL 00/10] migration queue, Peter Maydell, 2018/06/15