In real use cases, the migrate-recover command requires out-of-band
execution, because the thread processing normal commands is blocked by a
page fault in the guest memory. With this change, the tests will be
closer to real use cases and could help detect regressions and other
bugs in migration recovery.
Signed-off-by: Juraj Marcin <jmar...@redhat.com>
---
tests/qtest/migration/framework.c | 23 +++++++++++++++++++++--
tests/qtest/migration/framework.h | 2 ++
tests/qtest/migration/migration-qmp.c | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/migration/framework.c
b/tests/qtest/migration/framework.c
index 47ce07856e..4550cda129 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -194,6 +194,16 @@ static void cleanup(const char *filename)
unlink(path);
}
+static QList *migrate_start_get_qmp_capabilities(const MigrateStart *args)
+{
+ QList *capabilities = qlist_new();
+
+ if (args->oob) {
+ qlist_append_str(capabilities, "oob");
+ }
+ return capabilities;
+}
+
int migrate_start(QTestState **from, QTestState **to, const char *uri,
MigrateStart *args)
{
@@ -210,6 +220,7 @@ int migrate_start(QTestState **from, QTestState **to, const
char *uri,
const char *machine_alias, *machine_opts = "";
g_autofree char *machine = NULL;
const char *bootpath;
+ g_autoptr(QList) capabilities = migrate_start_get_qmp_capabilities(args);
if (args->use_shmem) {
if (!g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) {
@@ -314,7 +325,8 @@ int migrate_start(QTestState **from, QTestState **to, const
char *uri,
args->opts_source ? args->opts_source : "",
ignore_stderr);
if (!args->only_target) {
- *from = qtest_init_with_env(QEMU_ENV_SRC, cmd_source);
+ *from = qtest_init_with_env_and_capabilities(QEMU_ENV_SRC, cmd_source,
+ capabilities);
qtest_qmp_set_event_callback(*from,
migrate_watch_for_events,
&src_state);
@@ -334,7 +346,8 @@ int migrate_start(QTestState **from, QTestState **to, const
char *uri,
shmem_opts ? shmem_opts : "",
args->opts_target ? args->opts_target : "",
ignore_stderr);
- *to = qtest_init_with_env(QEMU_ENV_DST, cmd_target);
+ *to = qtest_init_with_env_and_capabilities(QEMU_ENV_DST, cmd_target,
+ capabilities);
qtest_qmp_set_event_callback(*to,
migrate_watch_for_events,
&dst_state);
@@ -601,6 +614,12 @@ void test_postcopy_recovery_common(MigrateCommon *args)
QTestState *from, *to;
g_autofree char *uri = NULL;
+ /*
+ * Always enable OOB QMP capability for recovery tests, migrate-recover is
+ * executed out-of-band
+ */
+ args->start.oob = true;
+
/* Always hide errors for postcopy recover tests since they're expected */
args->start.hide_stderr = true;
diff --git a/tests/qtest/migration/framework.h
b/tests/qtest/migration/framework.h
index e9fc4ec363..7991ee56b6 100644
--- a/tests/qtest/migration/framework.h
+++ b/tests/qtest/migration/framework.h
@@ -109,6 +109,8 @@ typedef struct {
const char *opts_target;
/* suspend the src before migrating to dest. */
bool suspend_me;
+ /* enable OOB QMP capability */
+ bool oob;
} MigrateStart;
typedef enum PostcopyRecoveryFailStage {
diff --git a/tests/qtest/migration/migration-qmp.c
b/tests/qtest/migration/migration-qmp.c
index 71b14b51b2..9431d2beda 100644
--- a/tests/qtest/migration/migration-qmp.c
+++ b/tests/qtest/migration/migration-qmp.c
@@ -464,7 +464,7 @@ void migrate_continue(QTestState *who, const char *state)
void migrate_recover(QTestState *who, const char *uri)
{
qtest_qmp_assert_success(who,
- "{ 'execute': 'migrate-recover', "
+ "{ 'exec-oob': 'migrate-recover', "
" 'id': 'recover-cmd', "
" 'arguments': { 'uri': %s } }",
uri);
--
2.47.1
