diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 13:20:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-23 10:08:05 +0000 |
| commit | ee86981bda9ecd40c8daf81b7307b1d2aff68174 (patch) | |
| tree | e4a3a109a9c40705cdc42035aa8db9c64a9e005c /tests/migration-test.c | |
| parent | ee264eb32c14f076c964fc34ee66f6f95cce2080 (diff) | |
| download | focaccia-qemu-ee86981bda9ecd40c8daf81b7307b1d2aff68174.tar.gz focaccia-qemu-ee86981bda9ecd40c8daf81b7307b1d2aff68174.zip | |
migration: Revert postcopy-blocktime commit set
This reverts commits ca6011c migration: add postcopy total blocktime into query-migrate 5f32dc8 migration: add blocktime calculation into migration-test 2f7dae9 migration: postcopy_blocktime documentation 3be98be migration: calculate vCPU blocktime on dst side 01a87f0 migration: add postcopy blocktime ctx into MigrationIncomingState 31bf06a migration: introduce postcopy-blocktime capability as they don't build on ppc32 due to trying to do atomic accesses on types that are larger than the host pointer type. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/migration-test.c')
| -rw-r--r-- | tests/migration-test.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c index 9fd5dadc0d..799e24ebc6 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -25,7 +25,6 @@ const unsigned start_address = 1024 * 1024; const unsigned end_address = 100 * 1024 * 1024; bool got_stop; -static bool uffd_feature_thread_id; #if defined(__linux__) #include <sys/syscall.h> @@ -55,7 +54,6 @@ 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; @@ -268,16 +266,6 @@ static uint64_t get_migration_pass(QTestState *who) return result; } -static void read_blocktime(QTestState *who) -{ - QDict *rsp, *rsp_return; - - rsp = wait_command(who, "{ '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 *who) { QDict *rsp, *rsp_return; @@ -537,7 +525,6 @@ static void test_migrate(void) migrate_set_capability(from, "postcopy-ram", "true"); migrate_set_capability(to, "postcopy-ram", "true"); - migrate_set_capability(to, "postcopy-blocktime", "true"); /* We want to pick a speed slow enough that the test completes * quickly, but that it doesn't complete precopy even on a slow @@ -566,9 +553,6 @@ static void test_migrate(void) wait_for_serial("dest_serial"); wait_for_migration_complete(from); - if (uffd_feature_thread_id) { - read_blocktime(to); - } g_free(uri); test_migrate_end(from, to); |