Skip to content

Commit 4ff969c

Browse files
shamiali2008Fabiano Rosas
authored andcommitted
tests/qtest/migration: Fix compile errors when CONFIG_UADK is set
Removes accidental inclusion of unrelated functions within CONFIG_UADK as this causes compile errors like: error: redefinition of ‘migrate_hook_start_xbzrle’ Fixes: 932f74f ("tests/qtest/migration: Split compression tests from migration-test.c") Signed-off-by: Shameer Kolothum <[email protected]> Reviewed-by: Fabiano Rosas <[email protected]> Message-Id: <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]>
1 parent 8b70d7f commit 4ff969c

File tree

1 file changed

+0
-54
lines changed

1 file changed

+0
-54
lines changed

tests/qtest/migration/compression-tests.c

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -88,59 +88,6 @@ migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from,
8888
return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk");
8989
}
9090

91-
static void *
92-
migrate_hook_start_xbzrle(QTestState *from,
93-
QTestState *to)
94-
{
95-
migrate_set_parameter_int(from, "xbzrle-cache-size", 33554432);
96-
97-
migrate_set_capability(from, "xbzrle", true);
98-
migrate_set_capability(to, "xbzrle", true);
99-
100-
return NULL;
101-
}
102-
103-
static void test_precopy_unix_xbzrle(void)
104-
{
105-
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
106-
MigrateCommon args = {
107-
.connect_uri = uri,
108-
.listen_uri = uri,
109-
.start_hook = migrate_hook_start_xbzrle,
110-
.iterations = 2,
111-
/*
112-
* XBZRLE needs pages to be modified when doing the 2nd+ round
113-
* iteration to have real data pushed to the stream.
114-
*/
115-
.live = true,
116-
};
117-
118-
test_precopy_common(&args);
119-
}
120-
121-
static void *
122-
migrate_hook_start_precopy_tcp_multifd_zlib(QTestState *from,
123-
QTestState *to)
124-
{
125-
/*
126-
* Overloading this test to also check that set_parameter does not error.
127-
* This is also done in the tests for the other compression methods.
128-
*/
129-
migrate_set_parameter_int(from, "multifd-zlib-level", 2);
130-
migrate_set_parameter_int(to, "multifd-zlib-level", 2);
131-
132-
return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib");
133-
}
134-
135-
static void test_multifd_tcp_zlib(void)
136-
{
137-
MigrateCommon args = {
138-
.listen_uri = "defer",
139-
.start_hook = migrate_hook_start_precopy_tcp_multifd_zlib,
140-
};
141-
test_precopy_common(&args);
142-
}
143-
14491
static void test_multifd_tcp_uadk(void)
14592
{
14693
MigrateCommon args = {
@@ -151,7 +98,6 @@ static void test_multifd_tcp_uadk(void)
15198
}
15299
#endif /* CONFIG_UADK */
153100

154-
155101
static void *
156102
migrate_hook_start_xbzrle(QTestState *from,
157103
QTestState *to)

0 commit comments

Comments
 (0)