[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/19] multifd: multifd_send_sync_main only needs the qemufile
From: |
Juan Quintela |
Subject: |
[PULL 11/19] multifd: multifd_send_sync_main only needs the qemufile |
Date: |
Mon, 27 Jan 2020 23:33:13 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index ad9cc3e7bd..152e9cf46d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1082,7 +1082,7 @@ void multifd_save_cleanup(void)
multifd_send_state = NULL;
}
-static void multifd_send_sync_main(RAMState *rs)
+static void multifd_send_sync_main(QEMUFile *f)
{
int i;
@@ -1090,7 +1090,7 @@ static void multifd_send_sync_main(RAMState *rs)
return;
}
if (multifd_send_state->pages->used) {
- if (multifd_send_pages(rs->f) < 0) {
+ if (multifd_send_pages(f) < 0) {
error_report("%s: multifd_send_pages fail", __func__);
return;
}
@@ -1111,7 +1111,7 @@ static void multifd_send_sync_main(RAMState *rs)
p->packet_num = multifd_send_state->packet_num++;
p->flags |= MULTIFD_FLAG_SYNC;
p->pending_job++;
- qemu_file_update_transfer(rs->f, p->packet_len);
+ qemu_file_update_transfer(f, p->packet_len);
ram_counters.multifd_bytes += p->packet_len;
ram_counters.transferred += p->packet_len;
qemu_mutex_unlock(&p->mutex);
@@ -3434,7 +3434,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
ram_control_before_iterate(f, RAM_CONTROL_SETUP);
ram_control_after_iterate(f, RAM_CONTROL_SETUP);
- multifd_send_sync_main(*rsp);
+ multifd_send_sync_main(f);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
@@ -3534,7 +3534,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
out:
if (ret >= 0
&& migration_is_setup_or_active(migrate_get_current()->state)) {
- multifd_send_sync_main(rs);
+ multifd_send_sync_main(rs->f);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
ram_counters.transferred += 8;
@@ -3593,7 +3593,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
}
if (ret >= 0) {
- multifd_send_sync_main(rs);
+ multifd_send_sync_main(rs->f);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
}
--
2.24.1
- [PULL 01/19] migration-test: Use g_free() instead of free(), (continued)
- [PULL 01/19] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/27
- [PULL 03/19] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/27
- [PULL 02/19] multifd: Make sure that we don't do any IO after an error, Juan Quintela, 2020/01/27
- [PULL 04/19] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/27
- [PULL 05/19] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/27
- [PULL 06/19] migration: Create migration_is_running(), Juan Quintela, 2020/01/27
- [PULL 08/19] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/27
- [PULL 07/19] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/27
- [PULL 09/19] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/27
- [PULL 10/19] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/27
- [PULL 11/19] multifd: multifd_send_sync_main only needs the qemufile,
Juan Quintela <=
- [PULL 12/19] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/27
- [PULL 13/19] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/27
- [PULL 14/19] multifd: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/27
- [PULL 15/19] multifd: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/27
- [PULL 16/19] multifd: Add multifd-method parameter, Juan Quintela, 2020/01/27
- [PULL 18/19] migration: Simplify get_qlist, Juan Quintela, 2020/01/27
- [PULL 19/19] migration/compress: compress QEMUFile is not writable, Juan Quintela, 2020/01/27
- [PULL 17/19] multifd: Split multifd code into its own file, Juan Quintela, 2020/01/27
- Re: [PULL 00/19] 10 next patches, Peter Maydell, 2020/01/28