aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2021-12-15 20:34:47 +0100
committerJuan Quintela <quintela@redhat.com>2022-01-28 15:38:22 +0100
commit0189c722917ce3626e21bcad675871228626d61b (patch)
tree66c2dda50125f3e5c2d27d8f75618a684f20bd6a
parent05931ec561a83a6054d0658ed2b9570f5175728a (diff)
downloadqemu-0189c722917ce3626e21bcad675871228626d61b.zip
qemu-0189c722917ce3626e21bcad675871228626d61b.tar.gz
qemu-0189c722917ce3626e21bcad675871228626d61b.tar.bz2
migration: ram_release_pages() always receive 1 page as argument
Remove the pages argument. And s/pages/page/ Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> --- - Use 1LL instead of casts (philmd) - Change the whole 1ULL for TARGET_PAGE_SIZE
-rw-r--r--migration/ram.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/migration/ram.c b/migration/ram.c
index 7223b0d..881fe49 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1204,13 +1204,13 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
return -1;
}
-static void ram_release_pages(const char *rbname, uint64_t offset, int pages)
+static void ram_release_page(const char *rbname, uint64_t offset)
{
if (!migrate_release_ram() || !migration_in_postcopy()) {
return;
}
- ram_discard_range(rbname, offset, ((ram_addr_t)pages) << TARGET_PAGE_BITS);
+ ram_discard_range(rbname, offset, TARGET_PAGE_SIZE);
}
/*
@@ -1365,7 +1365,7 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
}
exit:
- ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
+ ram_release_page(block->idstr, offset & TARGET_PAGE_MASK);
return zero_page;
}
@@ -2153,7 +2153,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)
xbzrle_cache_zero_page(rs, block->offset + offset);
XBZRLE_cache_unlock();
}
- ram_release_pages(block->idstr, offset, res);
+ ram_release_page(block->idstr, offset);
return res;
}