summaryrefslogtreecommitdiffstats
path: root/migration
diff options
context:
space:
mode:
authorWei Yang2019-08-06 02:46:48 +0200
committerDr. David Alan Gilbert2019-08-14 18:33:14 +0200
commit9dec3cc3f4545b8035ac7bf0854b81669b18c516 (patch)
tree2df80fedd7f528b4341fe492112aa89034ae5249 /migration
parentmigration/postcopy: simplify calculation of run_start and fixup_start_addr (diff)
downloadqemu-9dec3cc3f4545b8035ac7bf0854b81669b18c516.tar.gz
qemu-9dec3cc3f4545b8035ac7bf0854b81669b18c516.tar.xz
qemu-9dec3cc3f4545b8035ac7bf0854b81669b18c516.zip
migration/postcopy: use QEMU_IS_ALIGNED to replace host_offset
Use QEMU_IS_ALIGNED for the check, it would be more consistent with other align calculations. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Message-Id: <20190806004648.8659-3-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
-rw-r--r--migration/ram.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/migration/ram.c b/migration/ram.c
index d2184c3cfc..eee68a7991 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2955,14 +2955,12 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass,
}
while (run_start < pages) {
- unsigned long host_offset;
/*
* If the start of this run of pages is in the middle of a host
* page, then we need to fixup this host page.
*/
- host_offset = run_start % host_ratio;
- if (!host_offset) {
+ if (QEMU_IS_ALIGNED(run_start, host_ratio)) {
/* Find the end of this run */
if (unsent_pass) {
run_start = find_next_bit(unsentmap, pages, run_start + 1);
@@ -2974,10 +2972,9 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass,
* run doesn't finish at the end of a host page
* and we need to discard.
*/
- host_offset = run_start % host_ratio;
}
- if (host_offset) {
+ if (!QEMU_IS_ALIGNED(run_start, host_ratio)) {
unsigned long page;
unsigned long fixup_start_addr = QEMU_ALIGN_DOWN(run_start,
host_ratio);