Re: [Qemu-devel] [PATCH for-3.0 4/9] tests: introduce migrate_postcopy_* helpers

[Dr. David Alan Gilbert]

* Peter Xu (address@hidden) wrote:
> Separate the old postcopy UNIX socket test into three steps, provide a
> helper for each step.  With these helpers, we can do more compliated
> tests like postcopy recovery, while keep the codes shared.
> 
> Signed-off-by: Peter Xu <address@hidden>
> ---
>  tests/migration-test.c | 38 +++++++++++++++++++++++++++-----------
>  1 file changed, 27 insertions(+), 11 deletions(-)
> 
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 3a85446f95..2155869b96 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -351,13 +351,19 @@ static void migrate(QTestState *who, const char *uri)
>      qobject_unref(rsp);
>  }
>  
> -static void migrate_start_postcopy(QTestState *who)
> +static void migrate_postcopy_start(QTestState *from, QTestState *to)
>  {
>      QDict *rsp;
>  
> -    rsp = wait_command(who, "{ 'execute': 'migrate-start-postcopy' }");
> +    rsp = wait_command(from, "{ 'execute': 'migrate-start-postcopy' }");
>      g_assert(qdict_haskey(rsp, "return"));
>      qobject_unref(rsp);
> +
> +    if (!got_stop) {
> +        qtest_qmp_eventwait(from, "STOP");
> +    }
> +
> +    qtest_qmp_eventwait(to, "RESUME");
>  }
>  
>  static void test_migrate_start(QTestState **from, QTestState **to,
> @@ -505,7 +511,8 @@ static void test_deprecated(void)
>      qtest_quit(from);
>  }
>  
> -static void test_postcopy(void)
> +static void migrate_postcopy_prepare(QTestState **from_ptr,
> +                                     QTestState **to_ptr)
>  {
>      char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
>      QTestState *from, *to;
> @@ -527,28 +534,37 @@ static void test_postcopy(void)
>      wait_for_serial("src_serial");
>  
>      migrate(from, uri);
> +    g_free(uri);
>  
>      wait_for_migration_pass(from);
>  
> -    migrate_start_postcopy(from);
> -
> -    if (!got_stop) {
> -        qtest_qmp_eventwait(from, "STOP");
> -    }
> +    *from_ptr = from;
> +    *to_ptr = to;
> +}
>  
> -    qtest_qmp_eventwait(to, "RESUME");
> +static void migrate_postcopy_complete(QTestState *from, QTestState *to)
> +{
> +    wait_for_migration_complete(from);
>  
> +    /* Make sure we get at least one "B" on destination */
>      wait_for_serial("dest_serial");
> -    wait_for_migration_complete(from);

That change is OK, but it shouldn't be necessary with postcopy; we
should be seeing B's before the migration completes.

It's OK however, so:


Reviewed-by: Dr. David Alan Gilbert <address@hidden>

>      if (uffd_feature_thread_id) {
>          read_blocktime(to);
>      }
> -    g_free(uri);
>  
>      test_migrate_end(from, to, true);
>  }
>  
> +static void test_postcopy(void)
> +{
> +    QTestState *from, *to;
> +
> +    migrate_postcopy_prepare(&from, &to);
> +    migrate_postcopy_start(from, to);
> +    migrate_postcopy_complete(from, to);
> +}
> +
>  static void test_baddest(void)
>  {
>      QTestState *from, *to;
> -- 
> 2.17.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK