motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: refactor ram_save_target_page functions

Browse source 
Refactor ram_save_target_page legacy and multifd
functions into one. Other than simplifying it,
it frees 'migration_ops' object from usage, so it
is expunged.

Signed-off-by: Prasad Pandit <pjp@fedoraproject.org>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Message-ID: <20250127120823.144949-3-ppandit@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Prasad Pandit 2025-01-27 17:38:21 +05:30 • committed by Fabiano Rosas
parent a10b37c553
commit bc38dc2f5f
1 changed files with 17 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

67
migration/ram.c
View file

@ -448,13 +448,6 @@ void ram_transferred_add(uint64_t bytes)
} }
} }
struct MigrationOps {
int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
};
typedef struct MigrationOps MigrationOps;
MigrationOps *migration_ops;
static int ram_save_host_page_urgent(PageSearchStatus *pss); static int ram_save_host_page_urgent(PageSearchStatus *pss);
/* NOTE: page is the PFN not real ram_addr_t. */ /* NOTE: page is the PFN not real ram_addr_t. */
@ -1960,53 +1953,34 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len,
} }
/** /**
* ram_save_target_page_legacy: save one target page * ram_save_target_page: save one target page to the precopy thread
* * OR to multifd workers.
* Returns the number of pages written
* *
* @rs: current RAM state * @rs: current RAM state
* @pss: data about the page we want to send * @pss: data about the page we want to send
*/ */
static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)
{ {
ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS;
int res; int res;
if (control_save_page(pss, offset, &res)) { if (!migrate_multifd()
return res; || migrate_zero_page_detection() == ZERO_PAGE_DETECTION_LEGACY) {
}
if (save_zero_page(rs, pss, offset)) {
return 1;
}
return ram_save_page(rs, pss);
}
/**
* ram_save_target_page_multifd: send one target page to multifd workers
*
* Returns 1 if the page was queued, -1 otherwise.
*
* @rs: current RAM state
* @pss: data about the page we want to send
*/
static int ram_save_target_page_multifd(RAMState *rs, PageSearchStatus *pss)
{
RAMBlock *block = pss->block;
ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS;
/*
* While using multifd live migration, we still need to handle zero
* page checking on the migration main thread.
*/
if (migrate_zero_page_detection() == ZERO_PAGE_DETECTION_LEGACY) {
if (save_zero_page(rs, pss, offset)) { if (save_zero_page(rs, pss, offset)) {
return 1; return 1;
} }
} }
return ram_save_multifd_page(block, offset); if (migrate_multifd()) {
RAMBlock *block = pss->block;
return ram_save_multifd_page(block, offset);
}
if (control_save_page(pss, offset, &res)) {
return res;
}
return ram_save_page(rs, pss);
} }
/* Should be called before sending a host page */ /* Should be called before sending a host page */
@ -2095,7 +2069,7 @@ static int ram_save_host_page_urgent(PageSearchStatus *pss)
if (page_dirty) { if (page_dirty) {
/* Be strict to return code; it must be 1, or what else? */ /* Be strict to return code; it must be 1, or what else? */
if (migration_ops->ram_save_target_page(rs, pss) != 1) { if (ram_save_target_page(rs, pss) != 1) {
error_report_once("%s: ram_save_target_page failed", __func__); error_report_once("%s: ram_save_target_page failed", __func__);
ret = -1; ret = -1;
goto out; goto out;
@ -2164,7 +2138,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)
if (preempt_active) { if (preempt_active) {
qemu_mutex_unlock(&rs->bitmap_mutex); qemu_mutex_unlock(&rs->bitmap_mutex);
} }
tmppages = migration_ops->ram_save_target_page(rs, pss); tmppages = ram_save_target_page(rs, pss);
if (tmppages >= 0) { if (tmppages >= 0) {
pages += tmppages; pages += tmppages;
/* /*
@ -2362,8 +2336,6 @@ static void ram_save_cleanup(void *opaque)
xbzrle_cleanup(); xbzrle_cleanup();
multifd_ram_save_cleanup(); multifd_ram_save_cleanup();
ram_state_cleanup(rsp); ram_state_cleanup(rsp);
g_free(migration_ops);
migration_ops = NULL;
} }
static void ram_state_reset(RAMState *rs) static void ram_state_reset(RAMState *rs)
@ -3029,13 +3001,8 @@ static int ram_save_setup(QEMUFile *f, void *opaque, Error **errp)
return ret; return ret;
} }
migration_ops = g_malloc0(sizeof(MigrationOps));
if (migrate_multifd()) { if (migrate_multifd()) {
multifd_ram_save_setup(); multifd_ram_save_setup();
migration_ops->ram_save_target_page = ram_save_target_page_multifd;
} else {
migration_ops->ram_save_target_page = ram_save_target_page_legacy;
} }
/* /*