commit 20123ee1ded768a908d96b39b17ea281dfdb0ea6
author Peter Xu <peterx@redhat.com> Tue Oct 11 17:55:46 2022 -0400
committer Juan Quintela <quintela@redhat.com> Thu Dec 15 10:30:37 2022 +0100
tree 4e209baffbe1c7315e47a7812d1521c0d64bf609
parent c13221b56faaaf732de95d05a7742c1913363b48

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>

migration/ram.c

diff --git a/migration/ram.c b/migration/ram.c
index cc72c24..00a2e30 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -162,6 +162,11 @@
     return ret;
 }
 
+static bool postcopy_preempt_active(void)
+{
+    return migrate_postcopy_preempt() && migration_in_postcopy();
+}
+
 bool ramblock_is_ignored(RAMBlock *block)
 {
     return !qemu_ram_is_migratable(block) ||
@@ -2433,7 +2438,7 @@
 /* We need to make sure rs->f always points to the default channel elsewhere */
 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->f = migrate_get_current()->to_dst_file;
         trace_postcopy_preempt_reset_channel();
@@ -2471,7 +2476,7 @@
         return 0;
     }
 
-    if (migrate_postcopy_preempt() && migration_in_postcopy()) {
+    if (postcopy_preempt_active()) {
         postcopy_preempt_choose_channel(rs, pss);
     }