[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/18] multifd: multifd_send_pages only needs the qemufile
From: |
Juan Quintela |
Subject: |
[PULL 09/18] multifd: multifd_send_pages only needs the qemufile |
Date: |
Wed, 29 Jan 2020 12:15:27 +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 82c7edb083..602e9ca5a0 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -929,7 +929,7 @@ struct {
* false.
*/
-static int multifd_send_pages(RAMState *rs)
+static int multifd_send_pages(QEMUFile *f)
{
int i;
static int next_channel;
@@ -965,7 +965,7 @@ static int multifd_send_pages(RAMState *rs)
multifd_send_state->pages = p->pages;
p->pages = pages;
transferred = ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packet_len;
- qemu_file_update_transfer(rs->f, transferred);
+ qemu_file_update_transfer(f, transferred);
ram_counters.multifd_bytes += transferred;
ram_counters.transferred += transferred;;
qemu_mutex_unlock(&p->mutex);
@@ -993,7 +993,7 @@ static int multifd_queue_page(RAMState *rs, RAMBlock
*block, ram_addr_t offset)
}
}
- if (multifd_send_pages(rs) < 0) {
+ if (multifd_send_pages(rs->f) < 0) {
return -1;
}
@@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
return;
}
if (multifd_send_state->pages->used) {
- if (multifd_send_pages(rs) < 0) {
+ if (multifd_send_pages(rs->f) < 0) {
error_report("%s: multifd_send_pages fail", __func__);
return;
}
--
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, 2020/01/29
- [PULL 09/18] multifd: multifd_send_pages only needs the qemufile,
Juan Quintela <=
- [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
- Re: [PULL 00/18] Pull migration patches, Peter Maydell, 2020/01/30