Skip to contentSkip to conversation

tests/qtest/migration: Remove vmstate-static-checker test

PATCH In review Fabiano Rosas 2 participants 2 messages Aug 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/qtest/migration: Remove vmstate-static-checker test

I fumbled one of my last pull requests when fixing in-tree an issue with commit 87d67fadb9 ("monitor: Stop removing non-duplicated fds"). Basically mixed-up my git add -p and git checkout -p and committed a piece of test infra that has not been reviewed yet.

This has not caused any bad symptoms because the test is not enabled by default anywhere: make check doesn't use two qemu binaries and the CI doesn't have PYTHON set for the compat tests. Besides, the test works fine anyway, it would not break anything.

Remove this because it was never intended to be merged.

---
 tests/qtest/libqtest.c       | 17 +++-----
 tests/qtest/libqtest.h       |  2 -
 tests/qtest/migration-test.c | 82 ------------------------------------
 3 files changed, 6 insertions(+), 95 deletions(-)
tests/qtest/libqtest.c +6 -11
index 1326e34291..9d07de1fbd 100644
@@ -514,7 +514,12 @@ static QTestState *qtest_init_internal(const char *qemu_bin,
         kill(s->qemu_pid, SIGSTOP);
     }
 #endif
-    return s;
+
+    /* ask endianness of the target */
+
+    s->big_endian = qtest_query_target_endianness(s);
+
+   return s;
 }
 
 QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
@@ -522,21 +527,11 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
     return qtest_init_internal(qtest_qemu_binary(NULL), extra_args);
 }
 
-QTestState *qtest_init_with_env_no_handshake(const char *var,
-                                             const char *extra_args)
-{
-    return qtest_init_internal(qtest_qemu_binary(var), extra_args);
-}
-
 QTestState *qtest_init_with_env(const char *var, const char *extra_args)
 {
     QTestState *s = qtest_init_internal(qtest_qemu_binary(var), extra_args);
     QDict *greeting;
 
-    /* ask endianness of the target */
-
-    s->big_endian = qtest_query_target_endianness(s);
-
     /* Read the QMP greeting and then do the handshake */
     greeting = qtest_qmp_receive(s);
     qobject_unref(greeting);
tests/qtest/libqtest.h +0 -2
index c261b7e0b3..beb96b18eb 100644
@@ -68,8 +68,6 @@ QTestState *qtest_init(const char *extra_args);
  */
 QTestState *qtest_init_with_env(const char *var, const char *extra_args);
 
-QTestState *qtest_init_with_env_no_handshake(const char *var,
-                                             const char *extra_args);
 /**
  * qtest_init_without_qmp_handshake:
  * @extra_args: other arguments to pass to QEMU.  CAUTION: these
tests/qtest/migration-test.c +0 -82

100 lines not on this page · raw message

Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Fabiano Rosas

I fumbled one of my last pull requests when fixing in-tree an issue with commit 87d67fadb9 ("monitor: Stop removing non-duplicated fds"). Basically mixed-up my git add -p and git checkout -p and committed a piece of test infra that has not been reviewed yet.

Quoted 8 lines

This has not caused any bad symptoms because the test is not enabled by default anywhere: make check doesn't use two qemu binaries and the CI doesn't have PYTHON set for the compat tests. Besides, the test works fine anyway, it would not break anything.

Remove this because it was never intended to be merged.

Signature · 1 line
Peter Xu