aboutsummaryrefslogtreecommitdiff
path: root/migration/postcopy-ram.c
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2020-09-08 16:30:18 -0400
committerDr. David Alan Gilbert <dgilbert@redhat.com>2020-09-25 11:11:01 +0100
commit2e2bce167ee7d54a339bbc4208dfb47979ec59b9 (patch)
treee83ef90992a10be73de93e3f6c1ff521474024cc /migration/postcopy-ram.c
parentc02039a6f3730ddcf683a0ba9a175688c6db71a0 (diff)
downloadqemu-2e2bce167ee7d54a339bbc4208dfb47979ec59b9.zip
qemu-2e2bce167ee7d54a339bbc4208dfb47979ec59b9.tar.gz
qemu-2e2bce167ee7d54a339bbc4208dfb47979ec59b9.tar.bz2
migration: Rework migrate_send_rp_req_pages() function
We duplicated the logic of maintaining the last_rb variable at both callers of this function. Pass *rb pointer into the function so that we can avoid duplicating the logic. Also, when we have the rb pointer, it's also easier to remove the original 2nd & 4th parameters, because both of them (name of the ramblock when needed, or the page size) can be fetched from the ramblock pointer too. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20200908203022.341615-3-peterx@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/postcopy-ram.c')
-rw-r--r--migration/postcopy-ram.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 1654ff1..0a2f88a8 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -684,14 +684,7 @@ int postcopy_request_shared_page(struct PostCopyFD *pcfd, RAMBlock *rb,
qemu_ram_get_idstr(rb), rb_offset);
return postcopy_wake_shared(pcfd, client_addr, rb);
}
- if (rb != mis->last_rb) {
- mis->last_rb = rb;
- migrate_send_rp_req_pages(mis, qemu_ram_get_idstr(rb),
- aligned_rbo, pagesize);
- } else {
- /* Save some space */
- migrate_send_rp_req_pages(mis, NULL, aligned_rbo, pagesize);
- }
+ migrate_send_rp_req_pages(mis, rb, aligned_rbo);
return 0;
}
@@ -986,20 +979,7 @@ retry:
* Send the request to the source - we want to request one
* of our host page sizes (which is >= TPS)
*/
- if (rb != mis->last_rb) {
- mis->last_rb = rb;
- ret = migrate_send_rp_req_pages(mis,
- qemu_ram_get_idstr(rb),
- rb_offset,
- qemu_ram_pagesize(rb));
- } else {
- /* Save some space */
- ret = migrate_send_rp_req_pages(mis,
- NULL,
- rb_offset,
- qemu_ram_pagesize(rb));
- }
-
+ ret = migrate_send_rp_req_pages(mis, rb, rb_offset);
if (ret) {
/* May be network failure, try to wait for recovery */
if (ret == -EIO && postcopy_pause_fault_thread(mis)) {