1. Patchew
  2. QEMU
  3. [PATCH v4 00/16] migration: Add COLO multifd support and COLO migration unit test
  4. View patch

[PATCH v4 05/16] colo: Remove ENABLE_COLO loadvm command functions

Lukas Straub posted 16 patches 1 week, 3 days ago
Maintainers: Pierrick Bouvier <pierrick.bouvier@linaro.org>, Lukas Straub <lukasstraub2@web.de>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
There is a newer version of this series
[PATCH v4 05/16] colo: Remove ENABLE_COLO loadvm command functions
Posted by Lukas Straub 1 week, 3 days ago 
No need for it anymore now that x-colo capability is required
on incoming side.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
 include/migration/colo.h |  2 --
 migration/migration.c    | 26 --------------------------
 migration/savevm.c       | 10 ----------
 3 files changed, 38 deletions(-)

diff --git a/include/migration/colo.h b/include/migration/colo.h
index 2496a968cc1ce709f706c0efe57e4f765f163d3c..8f94054a10760d0f2598f080643f45f9944cf051 100644
--- a/include/migration/colo.h
+++ b/include/migration/colo.h
@@ -25,8 +25,6 @@ void migrate_start_colo_process(MigrationState *s);
 bool migration_in_colo_state(void);
 
 /* loadvm */
-int migration_incoming_enable_colo(Error **errp);
-void migration_incoming_disable_colo(void);
 bool migration_incoming_in_colo_state(void);
 
 COLOMode get_colo_mode(void);
diff --git a/migration/migration.c b/migration/migration.c
index bc8ce64ff5000b0eb634a20b22e5f3e3289b9707..3f3fc5276bb067ae1960e4b675b33208ad641b23 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -604,31 +604,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis,
     return migrate_send_rp_message_req_pages(mis, rb, start);
 }
 
-static bool migration_colo_enabled;
-void migration_incoming_disable_colo(void)
-{
-    ram_block_discard_disable(false);
-    migration_colo_enabled = false;
-}
-
-int migration_incoming_enable_colo(Error **errp)
-{
-#ifndef CONFIG_REPLICATION
-    error_setg(errp, "ENABLE_COLO command come in migration stream, but the "
-               "replication module is not built in");
-    return -ENOTSUP;
-#endif
-
-    if (!migrate_colo()) {
-        error_setg(errp, "ENABLE_COLO command come in migration stream"
-                   ", but x-colo capability is not set");
-        return -EINVAL;
-    }
-
-    migration_colo_enabled = true;
-    return 0;
-}
-
 void migrate_add_address(SocketAddress *address)
 {
     MigrationIncomingState *mis = migration_incoming_get_current();
@@ -735,7 +710,6 @@ static void process_incoming_migration_bh(void *opaque)
             runstate_set(RUN_STATE_PAUSED);
         }
     } else if (migrate_colo()) {
-        migration_incoming_disable_colo();
         vm_start();
     } else {
         runstate_set(global_state_get_runstate());
diff --git a/migration/savevm.c b/migration/savevm.c
index 0353ac2d0de819b6547a1f771e6a4c3b8fb1e4ef..413688b75f4bee6cb10878eb51886cf6ba14872d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2403,13 +2403,6 @@ static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis,
     return 0;
 }
 
-static int loadvm_process_enable_colo(MigrationIncomingState *mis,
-                                      Error **errp)
-{
-    ERRP_GUARD();
-    return migration_incoming_enable_colo(errp);
-}
-
 static int loadvm_postcopy_handle_switchover_start(Error **errp)
 {
     SaveStateEntry *se;
@@ -2528,9 +2521,6 @@ static int loadvm_process_command(QEMUFile *f, Error **errp)
     case MIG_CMD_RECV_BITMAP:
         return loadvm_handle_recv_bitmap(mis, len, errp);
 
-    case MIG_CMD_ENABLE_COLO:
-        return loadvm_process_enable_colo(mis, errp);
-
     case MIG_CMD_SWITCHOVER_START:
         return loadvm_postcopy_handle_switchover_start(errp);
     }

-- 
2.39.5
Re: [PATCH v4 05/16] colo: Remove ENABLE_COLO loadvm command functions
Posted by Fabiano Rosas 1 week ago 
Lukas Straub <lukasstraub2@web.de> writes:

> No need for it anymore now that x-colo capability is required
> on incoming side.
>
> Signed-off-by: Lukas Straub <lukasstraub2@web.de>
> ---
>  include/migration/colo.h |  2 --
>  migration/migration.c    | 26 --------------------------
>  migration/savevm.c       | 10 ----------
>  3 files changed, 38 deletions(-)
>
> diff --git a/include/migration/colo.h b/include/migration/colo.h
> index 2496a968cc1ce709f706c0efe57e4f765f163d3c..8f94054a10760d0f2598f080643f45f9944cf051 100644
> --- a/include/migration/colo.h
> +++ b/include/migration/colo.h
> @@ -25,8 +25,6 @@ void migrate_start_colo_process(MigrationState *s);
>  bool migration_in_colo_state(void);
>  
>  /* loadvm */
> -int migration_incoming_enable_colo(Error **errp);
> -void migration_incoming_disable_colo(void);
>  bool migration_incoming_in_colo_state(void);
>  
>  COLOMode get_colo_mode(void);
> diff --git a/migration/migration.c b/migration/migration.c
> index bc8ce64ff5000b0eb634a20b22e5f3e3289b9707..3f3fc5276bb067ae1960e4b675b33208ad641b23 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -604,31 +604,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis,
>      return migrate_send_rp_message_req_pages(mis, rb, start);
>  }
>  
> -static bool migration_colo_enabled;
> -void migration_incoming_disable_colo(void)
> -{
> -    ram_block_discard_disable(false);
> -    migration_colo_enabled = false;
> -}
> -
> -int migration_incoming_enable_colo(Error **errp)
> -{
> -#ifndef CONFIG_REPLICATION
> -    error_setg(errp, "ENABLE_COLO command come in migration stream, but the "
> -               "replication module is not built in");
> -    return -ENOTSUP;
> -#endif
> -
> -    if (!migrate_colo()) {
> -        error_setg(errp, "ENABLE_COLO command come in migration stream"
> -                   ", but x-colo capability is not set");
> -        return -EINVAL;
> -    }
> -
> -    migration_colo_enabled = true;
> -    return 0;
> -}
> -
>  void migrate_add_address(SocketAddress *address)
>  {
>      MigrationIncomingState *mis = migration_incoming_get_current();
> @@ -735,7 +710,6 @@ static void process_incoming_migration_bh(void *opaque)
>              runstate_set(RUN_STATE_PAUSED);
>          }
>      } else if (migrate_colo()) {
> -        migration_incoming_disable_colo();
>          vm_start();
>      } else {
>          runstate_set(global_state_get_runstate());
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 0353ac2d0de819b6547a1f771e6a4c3b8fb1e4ef..413688b75f4bee6cb10878eb51886cf6ba14872d 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2403,13 +2403,6 @@ static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis,
>      return 0;
>  }
>  
> -static int loadvm_process_enable_colo(MigrationIncomingState *mis,
> -                                      Error **errp)
> -{
> -    ERRP_GUARD();
> -    return migration_incoming_enable_colo(errp);
> -}
> -
>  static int loadvm_postcopy_handle_switchover_start(Error **errp)
>  {
>      SaveStateEntry *se;
> @@ -2528,9 +2521,6 @@ static int loadvm_process_command(QEMUFile *f, Error **errp)
>      case MIG_CMD_RECV_BITMAP:
>          return loadvm_handle_recv_bitmap(mis, len, errp);
>  
> -    case MIG_CMD_ENABLE_COLO:
> -        return loadvm_process_enable_colo(mis, errp);
> -
>      case MIG_CMD_SWITCHOVER_START:
>          return loadvm_postcopy_handle_switchover_start(errp);
>      }

Reviewed-by: Fabiano Rosas <farosas@suse.de>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.