[v2,02/15] migration: Add postcopy_preempt_active()

Commit Message

Peter Xu Oct. 11, 2022, 9:55 p.m. UTC

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

Reviewed-by: Dr. David Alan Gilbert <[e-mail]>
Signed-off-by: Peter Xu <[e-mail]>
---
 migration/ram.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Juan Quintela Nov. 14, 2022, 3:07 p.m. UTC | #1

Peter Xu <[e-mail]> wrote:
> Add the helper to show that postcopy preempt enabled, meanwhile active.
>
> Reviewed-by: Dr. David Alan Gilbert <[e-mail]>
> Signed-off-by: Peter Xu <[e-mail]>

Reviewed-by: Juan Quintela <[e-mail]>

Patch

diff --git a/migration/ram.c b/migration/ram.c
index cfeb571800..7aaa843a21 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -162,6 +162,11 @@  out:
     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 @@  static void postcopy_preempt_choose_channel(RAMState *rs, PageSearchStatus *pss)
 /* 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 @@  static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)
         return 0;
     }
 
-    if (migrate_postcopy_preempt() && migration_in_postcopy()) {
+    if (postcopy_preempt_active()) {
         postcopy_preempt_choose_channel(rs, pss);
     }