OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Juan Quintela 2020-01-22 16:03:01 +01:00
parent df94d32bb1
commit 67a4c8910c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/ram.c
View File

@ -974,7 +974,7 @@ static int multifd_send_pages(QEMUFile *f)
return 1; 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; 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; return -1;
} }
if (pages->block != block) { if (pages->block != block) {
return multifd_queue_page(rs, block, offset); return multifd_queue_page(f, block, offset);
} }
return 1; 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, static int ram_save_multifd_page(RAMState *rs, RAMBlock *block,
ram_addr_t offset) ram_addr_t offset)
{ {
if (multifd_queue_page(rs, block, offset) < 0) { if (multifd_queue_page(rs->f, block, offset) < 0) {
return -1; return -1;
} }
ram_counters.normal++; ram_counters.normal++;