[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 3/8] migration: Make ram_save_target_page() a pointer
From: |
Juan Quintela |
Subject: |
[PATCH v5 3/8] migration: Make ram_save_target_page() a pointer |
Date: |
Thu, 10 Mar 2022 16:34:49 +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 | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 947ed44c89..1006d8d585 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -295,6 +295,9 @@ struct RAMSrcPageRequest {
QSIMPLEQ_ENTRY(RAMSrcPageRequest) next_req;
};
+typedef struct RAMState RAMState;
+typedef struct PageSearchStatus PageSearchStatus;
+
/* State of RAM for migration */
struct RAMState {
/* QEMUFile used for this migration */
@@ -349,8 +352,8 @@ struct RAMState {
/* Queue of outstanding page requests from the destination */
QemuMutex src_page_req_mutex;
QSIMPLEQ_HEAD(, RAMSrcPageRequest) src_page_requests;
+ int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
};
-typedef struct RAMState RAMState;
static RAMState *ram_state;
@@ -2126,14 +2129,14 @@ static bool save_compress_page(RAMState *rs, RAMBlock
*block, ram_addr_t offset)
}
/**
- * 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;
@@ -2208,7 +2211,7 @@ static int ram_save_host_page(RAMState *rs,
PageSearchStatus *pss)
do {
/* Check the pages is dirty and if it is send it */
if (migration_bitmap_clear_dirty(rs, pss->block, pss->page)) {
- tmppages = ram_save_target_page(rs, pss);
+ tmppages = rs->ram_save_target_page(rs, pss);
if (tmppages < 0) {
return tmppages;
}
@@ -2937,6 +2940,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);
+ (*rsp)->ram_save_target_page = ram_save_target_page_legacy;
multifd_send_sync_main(f);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
--
2.34.1
- [PATCH v5 0/8] Migration: Transmit and detect zero pages in the multifd threads, Juan Quintela, 2022/03/10
- [PATCH v5 1/8] migration: Export ram_transferred_ram(), Juan Quintela, 2022/03/10
- [PATCH v5 2/8] multifd: Count the number of sent bytes correctly, Juan Quintela, 2022/03/10
- [PATCH v5 4/8] multifd: Add property to enable/disable zero_page, Juan Quintela, 2022/03/10
- [PATCH v5 5/8] migration: Export ram_release_page(), Juan Quintela, 2022/03/10
- [PATCH v5 3/8] migration: Make ram_save_target_page() a pointer,
Juan Quintela <=
- [PATCH v5 6/8] multifd: Support for zero pages transmission, Juan Quintela, 2022/03/10
- [PATCH v5 8/8] migration: Use multifd before we check for the zero page, Juan Quintela, 2022/03/10
- [PATCH v5 7/8] multifd: Zero pages transmission, Juan Quintela, 2022/03/10