diff options
| author | Peter Xu <peterx@redhat.com> | 2022-01-19 16:09:15 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2022-01-28 15:38:23 +0100 |
| commit | 258f5c9825a9fb77aeae8a9d8c0877e714c090e2 (patch) | |
| tree | cd0c6043d36a539c431029c54d6e25b2543496c5 | |
| parent | ae6806688016711bb9ec7541266d76ab511c5e3b (diff) | |
| download | focaccia-qemu-258f5c9825a9fb77aeae8a9d8c0877e714c090e2.tar.gz focaccia-qemu-258f5c9825a9fb77aeae8a9d8c0877e714c090e2.zip | |
migration: No off-by-one for pss->page update in host page size
We used to do off-by-one fixup for pss->page when finished one host huge page transfer. That seems to be unnecesary at all. Drop it. Cc: Keqian Zhu <zhukeqian1@huawei.com> Cc: Kunkun Jiang <jiangkunkun@huawei.com> Cc: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com> Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | migration/ram.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/ram.c b/migration/ram.c index ca879c744f..58adcaf430 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1617,7 +1617,7 @@ static int ram_save_release_protection(RAMState *rs, PageSearchStatus *pss, /* Check if page is from UFFD-managed region. */ if (pss->block->flags & RAM_UF_WRITEPROTECT) { void *page_address = pss->block->host + (start_page << TARGET_PAGE_BITS); - uint64_t run_length = (pss->page - start_page + 1) << TARGET_PAGE_BITS; + uint64_t run_length = (pss->page - start_page) << TARGET_PAGE_BITS; /* Flush async buffers before un-protect. */ qemu_fflush(rs->f); @@ -2230,7 +2230,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss) offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BITS)); /* The offset we leave with is the min boundary of host page and block */ - pss->page = MIN(pss->page, hostpage_boundary) - 1; + pss->page = MIN(pss->page, hostpage_boundary); res = ram_save_release_protection(rs, pss, start_page); return (res < 0 ? res : pages); |