[v3] migration: Add COLO multifd support and COLO migration unit test

[PATCH v3 03/10] Move ram state receive into multifd_ram_state_recv()

Posted by Lukas Straub 2 weeks, 1 day ago

This is in preparation for the next patch.

Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
 migration/multifd.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/migration/multifd.c b/migration/multifd.c
index ad6261688fdf98a5c7f4ee9fb80ba2901201a33e..332e6fc58053462419f3171f6c320ac37648ef7b 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -1253,6 +1253,15 @@ static int multifd_device_state_recv(MultiFDRecvParams *p, Error **errp)
     return ret;
 }
 
+static int multifd_ram_state_recv(MultiFDRecvParams *p, Error **errp)
+{
+    int ret;
+
+    ret = multifd_recv_state->ops->recv(p, errp);
+
+    return ret;
+}
+
 static void *multifd_recv_thread(void *opaque)
 {
     MigrationState *s = migrate_get_current();
@@ -1387,7 +1396,7 @@ static void *multifd_recv_thread(void *opaque)
                 assert(use_packets);
                 ret = multifd_device_state_recv(p, &local_err);
             } else {
-                ret = multifd_recv_state->ops->recv(p, &local_err);
+                ret = multifd_ram_state_recv(p, &local_err);
             }
             if (ret != 0) {
                 break;

-- 
2.39.5

Re: [PATCH v3 03/10] Move ram state receive into multifd_ram_state_recv()

Posted by Fabiano Rosas 2 weeks ago

Lukas Straub <lukasstraub2@web.de> writes:

> This is in preparation for the next patch.
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: Lukas Straub <lukasstraub2@web.de>

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

> ---
>  migration/multifd.c | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/migration/multifd.c b/migration/multifd.c
> index ad6261688fdf98a5c7f4ee9fb80ba2901201a33e..332e6fc58053462419f3171f6c320ac37648ef7b 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -1253,6 +1253,15 @@ static int multifd_device_state_recv(MultiFDRecvParams *p, Error **errp)
>      return ret;
>  }
>  
> +static int multifd_ram_state_recv(MultiFDRecvParams *p, Error **errp)
> +{
> +    int ret;
> +
> +    ret = multifd_recv_state->ops->recv(p, errp);
> +
> +    return ret;
> +}
> +
>  static void *multifd_recv_thread(void *opaque)
>  {
>      MigrationState *s = migrate_get_current();
> @@ -1387,7 +1396,7 @@ static void *multifd_recv_thread(void *opaque)
>                  assert(use_packets);
>                  ret = multifd_device_state_recv(p, &local_err);
>              } else {
> -                ret = multifd_recv_state->ops->recv(p, &local_err);
> +                ret = multifd_ram_state_recv(p, &local_err);
>              }
>              if (ret != 0) {
>                  break;