OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Add postcopy_preempt_active() 

Add the helper to show that postcopy preempt enabled, meanwhile active.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2022-10-11 17:55:46 -04:00 committed by Juan Quintela
parent c13221b56f
commit 20123ee1de
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
migration/ram.c
View File

@ -162,6 +162,11 @@ out:
return ret; return ret;
} }
static bool postcopy_preempt_active(void)
{
return migrate_postcopy_preempt() && migration_in_postcopy();
}
bool ramblock_is_ignored(RAMBlock *block) bool ramblock_is_ignored(RAMBlock *block)
{ {
return !qemu_ram_is_migratable(block) || return !qemu_ram_is_migratable(block) ||
@ -2433,7 +2438,7 @@ static void postcopy_preempt_choose_channel(RAMState *rs, PageSearchStatus *pss)
/* We need to make sure rs->f always points to the default channel elsewhere */ /* We need to make sure rs->f always points to the default channel elsewhere */
static void postcopy_preempt_reset_channel(RAMState *rs) static void postcopy_preempt_reset_channel(RAMState *rs)
{ {
if (migrate_postcopy_preempt() && migration_in_postcopy()) { if (postcopy_preempt_active()) {
rs->postcopy_channel = RAM_CHANNEL_PRECOPY; rs->postcopy_channel = RAM_CHANNEL_PRECOPY;
rs->f = migrate_get_current()->to_dst_file; rs->f = migrate_get_current()->to_dst_file;
trace_postcopy_preempt_reset_channel(); trace_postcopy_preempt_reset_channel();
@ -2471,7 +2476,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)
return 0; return 0;
} }
if (migrate_postcopy_preempt() && migration_in_postcopy()) { if (postcopy_preempt_active()) {
postcopy_preempt_choose_channel(rs, pss); postcopy_preempt_choose_channel(rs, pss);
} }