[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/18] multifd: multifd_queue_page only needs the qemufile
From: |
Juan Quintela |
Subject: |
[PULL 10/18] multifd: multifd_queue_page only needs the qemufile |
Date: |
Wed, 29 Jan 2020 12:15:28 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 8 ++++----
1 file 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++;
--
2.24.1
- [PULL 00/18] Pull migration patches, Juan Quintela, 2020/01/29
- [PULL 01/18] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/29
- [PULL 02/18] multifd: Make sure that we don't do any IO after an error, Juan Quintela, 2020/01/29
- [PULL 03/18] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/29
- [PULL 04/18] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/29
- [PULL 05/18] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/29
- [PULL 06/18] migration: Create migration_is_running(), Juan Quintela, 2020/01/29
- [PULL 11/18] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 10/18] multifd: multifd_queue_page only needs the qemufile,
Juan Quintela <=
- [PULL 09/18] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 15/18] multifd: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 12/18] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/29
- [PULL 13/18] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/29
- [PULL 17/18] migration: Simplify get_qlist, Juan Quintela, 2020/01/29
- [PULL 18/18] migration/compress: compress QEMUFile is not writable, Juan Quintela, 2020/01/29
- [PULL 07/18] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/29
- [PULL 08/18] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/29
- [PULL 16/18] multifd: Split multifd code into its own file, Juan Quintela, 2020/01/29