* Alexey Perevalov (a.pereva...@samsung.com) wrote:
> This patch just requests blocktime calculation,
> and check it in case when UFFD_FEATURE_THREAD_ID feature is set
> on the host.
>
> Signed-off-by: Alexey Perevalov <a.pereva...@samsung.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
(I preferred the bool got_stop and explicitly initialising it, because
if we add a 2nd test then it gets reset OK).
Dave
> ---
> tests/postcopy-test.c | 63
> +++++++++++++++++++++++++++++++++++++++------------
> 1 file changed, 48 insertions(+), 15 deletions(-)
>
> diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c
> index 8142f2a..4231cce 100644
> --- a/tests/postcopy-test.c
> +++ b/tests/postcopy-test.c
> @@ -24,7 +24,8 @@
>
> const unsigned start_address = 1024 * 1024;
> const unsigned end_address = 100 * 1024 * 1024;
> -bool got_stop;
> +static bool got_stop;
> +static bool uffd_feature_thread_id;
>
> #if defined(__linux__)
> #include <sys/syscall.h>
> @@ -54,6 +55,7 @@ static bool ufd_version_check(void)
> g_test_message("Skipping test: UFFDIO_API failed");
> return false;
> }
> + uffd_feature_thread_id = api_struct.features & UFFD_FEATURE_THREAD_ID;
>
> ioctl_mask = (__u64)1 << _UFFDIO_REGISTER |
> (__u64)1 << _UFFDIO_UNREGISTER;
> @@ -265,22 +267,48 @@ static uint64_t get_migration_pass(void)
> return result;
> }
>
> -static void wait_for_migration_complete(void)
> +static bool get_src_status(void)
> {
> QDict *rsp, *rsp_return;
> + const char *status;
> + bool result;
> +
> + rsp = return_or_event(qmp("{ 'execute': 'query-migrate' }"));
> + rsp_return = qdict_get_qdict(rsp, "return");
> + status = qdict_get_str(rsp_return, "status");
> + g_assert_cmpstr(status, !=, "failed");
> + result = strcmp(status, "completed") == 0;
> + QDECREF(rsp);
> + return result;
> +}
> +
> +static void read_blocktime(void)
> +{
> + QDict *rsp, *rsp_return;
> +
> + rsp = return_or_event(qmp("{ 'execute': 'query-migrate' }"));
> + rsp_return = qdict_get_qdict(rsp, "return");
> + g_assert(qdict_haskey(rsp_return, "postcopy-blocktime"));
> + QDECREF(rsp);
> +}
> +
> +static void wait_for_migration_complete(QTestState *from, QTestState *to)
> +{
> bool completed;
>
> do {
> - const char *status;
> -
> - rsp = return_or_event(qmp("{ 'execute': 'query-migrate' }"));
> - rsp_return = qdict_get_qdict(rsp, "return");
> - status = qdict_get_str(rsp_return, "status");
> - completed = strcmp(status, "completed") == 0;
> - g_assert_cmpstr(status, !=, "failed");
> - QDECREF(rsp);
> +
> + /* test src state */
> + global_qtest = from;
> + completed = get_src_status();
> +
> usleep(1000 * 100);
> } while (!completed);
> +
> + if (uffd_feature_thread_id) {
> + global_qtest = to;
> + read_blocktime();
> + }
> }
>
> static void wait_for_migration_pass(void)
> @@ -364,8 +392,6 @@ static void test_migrate(void)
> char *bootpath = g_strdup_printf("%s/bootsect", tmpfs);
> const char *arch = qtest_get_arch();
>
> - got_stop = false;
> -
> if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> init_bootfile_x86(bootpath);
> cmd_src = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
> @@ -425,6 +451,15 @@ static void test_migrate(void)
> g_assert(qdict_haskey(rsp, "return"));
> QDECREF(rsp);
>
> + global_qtest = to;
> + rsp = qmp("{ 'execute': 'migrate-set-capabilities',"
> + "'arguments': { "
> + "'capabilities': [ {"
> + "'capability': 'postcopy-blocktime',"
> + "'state': true } ] } }");
> + g_assert(qdict_haskey(rsp, "return"));
> + QDECREF(rsp);
> +
> /* We want to pick a speed slow enough that the test completes
> * quickly, but that it doesn't complete precopy even on a slow
> * machine, so also set the downtime.
> @@ -441,7 +476,6 @@ static void test_migrate(void)
> g_assert(qdict_haskey(rsp, "return"));
> QDECREF(rsp);
>
> -
> /* Wait for the first serial output from the source */
> wait_for_serial("src_serial");
>
> @@ -467,8 +501,7 @@ static void test_migrate(void)
> qmp_eventwait("RESUME");
>
> wait_for_serial("dest_serial");
> - global_qtest = from;
> - wait_for_migration_complete();
> + wait_for_migration_complete(from, to);
>
> qtest_quit(from);
>
> --
> 2.7.4
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
