[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/17] tests/qtest/migration: Fix compile errors when CONFIG_UADK
From: |
Fabiano Rosas |
Subject: |
[PULL 17/17] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set |
Date: |
Tue, 17 Dec 2024 14:48:55 -0300 |
From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Removes accidental inclusion of unrelated functions within CONFIG_UADK
as this causes compile errors like:
error: redefinition of ‘migrate_hook_start_xbzrle’
Fixes: 932f74f3fe6e ("tests/qtest/migration: Split compression tests from
migration-test.c")
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20241217131046.83844-1-shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/migration/compression-tests.c | 54 -----------------------
1 file changed, 54 deletions(-)
diff --git a/tests/qtest/migration/compression-tests.c
b/tests/qtest/migration/compression-tests.c
index 6de87bc47d..d78f1f11f1 100644
--- a/tests/qtest/migration/compression-tests.c
+++ b/tests/qtest/migration/compression-tests.c
@@ -88,59 +88,6 @@ migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from,
return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk");
}
-static void *
-migrate_hook_start_xbzrle(QTestState *from,
- QTestState *to)
-{
- migrate_set_parameter_int(from, "xbzrle-cache-size", 33554432);
-
- migrate_set_capability(from, "xbzrle", true);
- migrate_set_capability(to, "xbzrle", true);
-
- return NULL;
-}
-
-static void test_precopy_unix_xbzrle(void)
-{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
- MigrateCommon args = {
- .connect_uri = uri,
- .listen_uri = uri,
- .start_hook = migrate_hook_start_xbzrle,
- .iterations = 2,
- /*
- * XBZRLE needs pages to be modified when doing the 2nd+ round
- * iteration to have real data pushed to the stream.
- */
- .live = true,
- };
-
- test_precopy_common(&args);
-}
-
-static void *
-migrate_hook_start_precopy_tcp_multifd_zlib(QTestState *from,
- QTestState *to)
-{
- /*
- * Overloading this test to also check that set_parameter does not error.
- * This is also done in the tests for the other compression methods.
- */
- migrate_set_parameter_int(from, "multifd-zlib-level", 2);
- migrate_set_parameter_int(to, "multifd-zlib-level", 2);
-
- return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib");
-}
-
-static void test_multifd_tcp_zlib(void)
-{
- MigrateCommon args = {
- .listen_uri = "defer",
- .start_hook = migrate_hook_start_precopy_tcp_multifd_zlib,
- };
- test_precopy_common(&args);
-}
-
static void test_multifd_tcp_uadk(void)
{
MigrateCommon args = {
@@ -151,7 +98,6 @@ static void test_multifd_tcp_uadk(void)
}
#endif /* CONFIG_UADK */
-
static void *
migrate_hook_start_xbzrle(QTestState *from,
QTestState *to)
--
2.35.3
- [PULL 03/17] migration/multifd: Allow to sync with sender threads only, (continued)
- [PULL 03/17] migration/multifd: Allow to sync with sender threads only, Fabiano Rosas, 2024/12/17
- [PULL 06/17] migration/multifd: Remove sync processing on postcopy, Fabiano Rosas, 2024/12/17
- [PULL 09/17] migration/multifd: Fix compat with QEMU < 9.0, Fabiano Rosas, 2024/12/17
- [PULL 02/17] migration/multifd: Further remove the SYNC on complete, Fabiano Rosas, 2024/12/17
- [PULL 10/17] s390x: Fix CSS migration, Fabiano Rosas, 2024/12/17
- [PULL 08/17] migration/multifd: Document the reason to sync for save_setup(), Fabiano Rosas, 2024/12/17
- [PULL 11/17] migration: Add helper to get target runstate, Fabiano Rosas, 2024/12/17
- [PULL 12/17] qmp/cont: Only activate disks if migration completed, Fabiano Rosas, 2024/12/17
- [PULL 13/17] migration/block: Make late-block-active the default, Fabiano Rosas, 2024/12/17
- [PULL 15/17] migration/block: Fix possible race with block_inactive, Fabiano Rosas, 2024/12/17
- [PULL 17/17] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set,
Fabiano Rosas <=
- [PULL 14/17] migration/block: Apply late-block-active behavior to postcopy, Fabiano Rosas, 2024/12/17
- [PULL 16/17] migration/block: Rewrite disk activation, Fabiano Rosas, 2024/12/17
- Re: [PULL 00/17] Migration patches for 2024-12-17, Stefan Hajnoczi, 2024/12/19