[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/22] migration: Make ram_save_target_page() a pointer
From: |
Juan Quintela |
Subject: |
[PULL 10/22] migration: Make ram_save_target_page() a pointer |
Date: |
Mon, 13 Feb 2023 03:51:38 +0100 |
We are going to create a new function for multifd latest in the series.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/ram.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 6abfe075f2..0890816a30 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -452,6 +452,13 @@ void dirty_sync_missed_zero_copy(void)
ram_counters.dirty_sync_missed_zero_copy++;
}
+struct MigrationOps {
+ int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
+};
+typedef struct MigrationOps MigrationOps;
+
+MigrationOps *migration_ops;
+
CompressionStats compression_counters;
struct CompressParam {
@@ -2295,14 +2302,14 @@ static bool save_compress_page(RAMState *rs,
PageSearchStatus *pss,
}
/**
- * ram_save_target_page: save one target page
+ * ram_save_target_page_legacy: save one target page
*
* Returns the number of pages written
*
* @rs: current RAM state
* @pss: data about the page we want to send
*/
-static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)
+static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
{
RAMBlock *block = pss->block;
ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS;
@@ -2428,7 +2435,7 @@ static int ram_save_host_page_urgent(PageSearchStatus
*pss)
if (page_dirty) {
/* Be strict to return code; it must be 1, or what else? */
- if (ram_save_target_page(rs, pss) != 1) {
+ if (migration_ops->ram_save_target_page(rs, pss) != 1) {
error_report_once("%s: ram_save_target_page failed", __func__);
ret = -1;
goto out;
@@ -2497,7 +2504,7 @@ static int ram_save_host_page(RAMState *rs,
PageSearchStatus *pss)
if (preempt_active) {
qemu_mutex_unlock(&rs->bitmap_mutex);
}
- tmppages = ram_save_target_page(rs, pss);
+ tmppages = migration_ops->ram_save_target_page(rs, pss);
if (tmppages >= 0) {
pages += tmppages;
/*
@@ -2697,6 +2704,8 @@ static void ram_save_cleanup(void *opaque)
xbzrle_cleanup();
compress_threads_save_cleanup();
ram_state_cleanup(rsp);
+ g_free(migration_ops);
+ migration_ops = NULL;
}
static void ram_state_reset(RAMState *rs)
@@ -3252,6 +3261,8 @@ 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);
+ migration_ops = g_malloc0(sizeof(MigrationOps));
+ migration_ops->ram_save_target_page = ram_save_target_page_legacy;
ret = multifd_send_sync_main(f);
if (ret < 0) {
return ret;
--
2.39.1
- [PULL 00/22] Migration 20230213 patches, (continued)
- [PULL 00/22] Migration 20230213 patches, Juan Quintela, 2023/02/12
- [PULL 02/22] multifd: cleanup the function multifd_channel_connect, Juan Quintela, 2023/02/12
- [PULL 01/22] migration: Remove spurious files, Juan Quintela, 2023/02/12
- [PULL 03/22] multifd: Remove some redundant code, Juan Quintela, 2023/02/12
- [PULL 04/22] linux-headers: Update to v6.1, Juan Quintela, 2023/02/12
- [PULL 05/22] util/userfaultfd: Support /dev/userfaultfd, Juan Quintela, 2023/02/12
- [PULL 06/22] migration: Simplify ram_find_and_save_block(), Juan Quintela, 2023/02/12
- [PULL 07/22] migration: Make find_dirty_block() return a single parameter, Juan Quintela, 2023/02/12
- [PULL 08/22] migration: Split ram_bytes_total_common() in two functions, Juan Quintela, 2023/02/12
- [PULL 09/22] migration: Calculate ram size once, Juan Quintela, 2023/02/12
- [PULL 10/22] migration: Make ram_save_target_page() a pointer,
Juan Quintela <=
- [PULL 14/22] migration: Rework multi-channel checks on URI, Juan Quintela, 2023/02/12
- [PULL 12/22] AVX512 support for xbzrle_encode_buffer, Juan Quintela, 2023/02/12
- [PULL 13/22] Update bench-code for addressing CI problem, Juan Quintela, 2023/02/12
- [PULL 15/22] migration: Cleanup postcopy_preempt_setup(), Juan Quintela, 2023/02/12
- [PULL 16/22] migration: Add a semaphore to count PONGs, Juan Quintela, 2023/02/12
- [PULL 17/22] migration: Postpone postcopy preempt channel to be after main, Juan Quintela, 2023/02/12
- [PULL 18/22] migration/multifd: Change multifd_load_cleanup() signature and usage, Juan Quintela, 2023/02/12
- [PULL 19/22] migration/multifd: Remove unnecessary assignment on multifd_load_cleanup(), Juan Quintela, 2023/02/12
- [PULL 20/22] migration/multifd: Join all multifd threads in order to avoid leaks, Juan Quintela, 2023/02/12
- [PULL 22/22] ram: Document migration ram flags, Juan Quintela, 2023/02/12