aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2020-01-22 16:03:01 +0100
committerJuan Quintela <quintela@redhat.com>2020-01-29 11:28:59 +0100
commit67a4c8910c7351114f2bffe6b0eceac6ad9c72af (patch)
tree65f5940fca34f0c3ca8b5b1125091f4f14954359
parentdf94d32bb14faa0a329782b5354fe0ab5b1e1ef5 (diff)
multifd: multifd_queue_page only needs the qemufile
Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-rw-r--r--migration/ram.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/migration/ram.c b/migration/ram.c
index 602e9ca5a0..ad9cc3e7bd 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -974,7 +974,7 @@ static int multifd_send_pages(QEMUFile *f)
return 1;
}
-static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
+static int multifd_queue_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset)
{
MultiFDPages_t *pages = multifd_send_state->pages;
@@ -993,12 +993,12 @@ static int multifd_queue_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
}
}
- if (multifd_send_pages(rs->f) < 0) {
+ if (multifd_send_pages(f) < 0) {
return -1;
}
if (pages->block != block) {
- return multifd_queue_page(rs, block, offset);
+ return multifd_queue_page(f, block, offset);
}
return 1;
@@ -2136,7 +2136,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
static int ram_save_multifd_page(RAMState *rs, RAMBlock *block,
ram_addr_t offset)
{
- if (multifd_queue_page(rs, block, offset) < 0) {
+ if (multifd_queue_page(rs->f, block, offset) < 0) {
return -1;
}
ram_counters.normal++;