Remove the test test_validate_caps_pair, which asserted postcopy-ram and mapped-ram capabilities cannot be active together. The new fast snapshot load feature is exactly this pair of capabilities active together, with the following patches in this series, this combination will now supported and be functional.
Remove the capability check that rejected mapped-ram and postcopy-ram being set simultaneously, as this combination now corresponds to fast snapshot load. No replacement test for fast snapshot load is included in this RFC. A test exercising the full save/load flow will be added in a follow-up. Signed-off-by: Aadeshveer Singh <[email protected]> --- migration/options.c | 6 ---- tests/qtest/migration/misc-tests.c | 52 ------------------------------ 2 files changed, 58 deletions(-) diff --git a/migration/options.c b/migration/options.c index 5cbfd29099..16583651ac 100644 --- a/migration/options.c +++ b/migration/options.c @@ -727,12 +727,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) "Mapped-ram migration is incompatible with xbzrle"); return false; } - - if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) { - error_setg(errp, - "Mapped-ram migration is incompatible with postcopy"); - return false; - } } /* diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/misc-tests.c index ec6d438cdc..4e0deb7f18 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -201,55 +201,6 @@ static void do_test_validate_uri_channel(MigrateCommon *args) migrate_end(from, to, false); } -static void validate_caps_pair(QTestState *from, - const char *first_capability, - const char *second_capability, - const char *expected_error) -{ - QDict *rsp; - const char *error_desc; - - migrate_set_capability(from, first_capability, true); - - rsp = qtest_qmp_assert_failure_ref( - from, - "{ 'execute': 'migrate-set-capabilities'," - " 'arguments': { 'capabilities': [ { " - " 'capability': %s, 'state': true } ] } }", - second_capability); - - error_desc = qdict_get_str(rsp, "desc"); - g_assert_cmpstr(error_desc, ==, expected_error); - qobject_unref(rsp); - - migrate_set_capability(from, first_capability, false); -} - -static void test_validate_caps_pair(char *test_path, MigrateCommon *args) -{ - g_autofree char *serial_path = g_strconcat(tmpfs, "/src_serial", NULL); - g_autofree char *cap_pair = g_path_get_basename(test_path); - QTestState *from, *to; - - args->start.hide_stderr = true; - args->start.only_source = true; - - if (migrate_start(&from, &to, &args->start)) { - return; - } - - if (g_str_equal(cap_pair, "mapped_ram_postcopy")) { - const char *error = - "Mapped-ram migration is incompatible with postcopy"; - - validate_caps_pair(from, "mapped-ram", "postcopy-ram", error); - validate_caps_pair(from, "postcopy-ram", "mapped-ram", error); - } - - qtest_quit(from); - unlink(serial_path); -} - static void test_validate_uri_channels_both_set(char *name, MigrateCommon *args) { args->uri = "tcp:127.0.0.1:0", @@ -309,7 +260,4 @@ void migration_test_add_misc(MigrationTestEnv *env) test_validate_uri_channels_both_set); migration_test_add("/migration/validate_uri/channels/none_set", test_validate_uri_channels_none_set); - migration_test_add_suffix("/migration/validate_caps/", - "mapped_ram_postcopy", - test_validate_caps_pair); } -- 2.54.0
