diff options
author | Peter Xu <peterx@redhat.com> | 2024-06-19 18:30:42 -0400 |
---|---|---|
committer | Fabiano Rosas <farosas@suse.de> | 2024-06-21 09:48:00 -0300 |
commit | 0fd397359540a6622c5f2164e76fc2cefd811f2a (patch) | |
tree | 1bd56498945f9ee35d08b3b18f4c502c71c6c71d /tests/qtest | |
parent | 21e89f7ad526f0dddfc722e615bfb0fcdb705c87 (diff) | |
download | qemu-0fd397359540a6622c5f2164e76fc2cefd811f2a.zip qemu-0fd397359540a6622c5f2164e76fc2cefd811f2a.tar.gz qemu-0fd397359540a6622c5f2164e76fc2cefd811f2a.tar.bz2 |
tests/migration-tests: Drop most WIN32 ifdefs for postcopy failure tests
Most of them are not needed, we can stick with one ifdef inside
postcopy_recover_fail() so as to cover the scm right tricks only.
The tests won't run on windows anyway due to has_uffd always false.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Diffstat (limited to 'tests/qtest')
-rw-r--r-- | tests/qtest/migration-test.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 6207305..b7dea1a 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1364,9 +1364,9 @@ static void wait_for_postcopy_status(QTestState *one, const char *status) "completed", NULL }); } -#ifndef _WIN32 static void postcopy_recover_fail(QTestState *from, QTestState *to) { +#ifndef _WIN32 int ret, pair1[2], pair2[2]; char c; @@ -1428,8 +1428,8 @@ static void postcopy_recover_fail(QTestState *from, QTestState *to) close(pair1[1]); close(pair2[0]); close(pair2[1]); +#endif } -#endif /* _WIN32 */ static void test_postcopy_recovery_common(MigrateCommon *args) { @@ -1469,7 +1469,6 @@ static void test_postcopy_recovery_common(MigrateCommon *args) wait_for_postcopy_status(to, "postcopy-paused"); wait_for_postcopy_status(from, "postcopy-paused"); -#ifndef _WIN32 if (args->postcopy_recovery_test_fail) { /* * Test when a wrong socket specified for recover, and then the @@ -1478,7 +1477,6 @@ static void test_postcopy_recovery_common(MigrateCommon *args) postcopy_recover_fail(from, to); /* continue with a good recovery */ } -#endif /* _WIN32 */ /* * Create a new socket to emulate a new channel that is different @@ -1507,7 +1505,6 @@ static void test_postcopy_recovery(void) test_postcopy_recovery_common(&args); } -#ifndef _WIN32 static void test_postcopy_recovery_double_fail(void) { MigrateCommon args = { @@ -1516,7 +1513,6 @@ static void test_postcopy_recovery_double_fail(void) test_postcopy_recovery_common(&args); } -#endif /* _WIN32 */ #ifdef CONFIG_GNUTLS static void test_postcopy_recovery_tls_psk(void) @@ -3782,10 +3778,8 @@ int main(int argc, char **argv) test_postcopy_preempt); migration_test_add("/migration/postcopy/preempt/recovery/plain", test_postcopy_preempt_recovery); -#ifndef _WIN32 migration_test_add("/migration/postcopy/recovery/double-failures", test_postcopy_recovery_double_fail); -#endif /* _WIN32 */ if (is_x86) { migration_test_add("/migration/postcopy/suspend", test_postcopy_suspend); |