Wei Yang <richardw.y...@linux.intel.com> wrote: > On Wed, May 15, 2019 at 02:15:43PM +0200, Juan Quintela wrote:
>> >> #define MULTIFD_FLAG_SYNC (1 << 0) >>+#define MULTIFD_FLAG_ZLIB (1 << 1) >> > > If no one use this in this patch, prefer to put it where it will be used. Oops, you are right, I have to use it. >>@@ -1253,6 +1270,17 @@ int multifd_save_setup(void) >> p->packet = g_malloc0(p->packet_len); >> p->name = g_strdup_printf("multifdsend_%d", i); >> socket_send_channel_create(multifd_new_send_channel_async, p); >>+ zs->zalloc = Z_NULL; >>+ zs->zfree = Z_NULL; >>+ zs->opaque = Z_NULL; > > Since zlib is not default option, is it better to setup these when zlib is > set? Moved to an opaque void *data pointer, thanks. >>+ if (deflateInit(zs, migrate_compress_level()) != Z_OK) { >>+ printf("deflate init failed\n"); >>+ return -1; >>+ } >>+ /* We will never have more than page_count pages */ >>+ p->zbuff_len = page_count * qemu_target_page_size(); >>+ p->zbuff_len *= 2; >>+ p->zbuff = g_malloc0(p->zbuff_len); >> } >> return 0; >> } >>@@ -1322,6 +1350,9 @@ int multifd_load_cleanup(Error **errp) >> p->packet_len = 0; >> g_free(p->packet); >> p->packet = NULL; >>+ inflateEnd(&p->zs); >>+ g_free(p->zbuff); >>+ p->zbuff = NULL; >> } >> qemu_sem_destroy(&multifd_recv_state->sem_sync); >> g_free(multifd_recv_state->params); >>@@ -1440,6 +1471,7 @@ int multifd_load_setup(void) >> >> for (i = 0; i < thread_count; i++) { >> MultiFDRecvParams *p = &multifd_recv_state->params[i]; >>+ z_stream *zs = &p->zs; >> >> qemu_mutex_init(&p->mutex); >> qemu_sem_init(&p->sem_sync, 0); >>@@ -1449,6 +1481,21 @@ int multifd_load_setup(void) >> + sizeof(ram_addr_t) * page_count; >> p->packet = g_malloc0(p->packet_len); >> p->name = g_strdup_printf("multifdrecv_%d", i); >>+ >>+ zs->zalloc = Z_NULL; >>+ zs->zfree = Z_NULL; >>+ zs->opaque = Z_NULL; >>+ zs->avail_in = 0; >>+ zs->next_in = Z_NULL; >>+ if (inflateInit(zs) != Z_OK) { >>+ printf("inflate init failed\n"); >>+ return -1; >>+ } >>+ /* We will never have more than page_count pages */ >>+ p->zbuff_len = page_count * qemu_target_page_size(); >>+ /* We know compression "could" use more space */ >>+ p->zbuff_len *= 2; >>+ p->zbuff = g_malloc0(p->zbuff_len); >> } >> return 0; >> } >>diff --git a/qapi/migration.json b/qapi/migration.json >>index 8ec1944b7a..e6c27fae06 100644 >>--- a/qapi/migration.json >>+++ b/qapi/migration.json >>@@ -493,7 +493,7 @@ >> # >> ## >> { 'enum': 'MultifdCompress', >>- 'data': [ 'none' ] } >>+ 'data': [ 'none', 'zlib' ] } >> >> ## >> # @MigrationParameter: >>diff --git a/tests/migration-test.c b/tests/migration-test.c >>index 8a1ccc2516..2dd4d4c5b4 100644 >>--- a/tests/migration-test.c >>+++ b/tests/migration-test.c >>@@ -1119,6 +1119,11 @@ static void test_multifd_tcp_none(void) >> test_multifd_tcp("none"); >> } >> >>+static void test_multifd_tcp_zlib(void) >>+{ >>+ test_multifd_tcp("zlib"); >>+} >>+ >> int main(int argc, char **argv) >> { >> char template[] = "/tmp/migration-test-XXXXXX"; >>@@ -1174,6 +1179,7 @@ int main(int argc, char **argv) >> /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */ >> qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix); >> qtest_add_func("/migration/multifd/tcp/none", test_multifd_tcp_none); >>+ qtest_add_func("/migration/multifd/tcp/zlib", test_multifd_tcp_zlib); > > Actually zlib is not enabled at this moment, the test here may not touch the > real functionality. It is, see what the test_multifd_tcp("zlib"); line does for: >> test_multifd_tcp("none"); >> } >> >>+static void test_multifd_tcp_zlib(void) >>+{ >>+ test_multifd_tcp("zlib"); >>+} >>+ >> int main(int argc, char **argv) >> { >> char template[] = "/tmp/migration-test-XXXXXX"; >>@@ -1174,6 +1179,7 @@ int main(int argc, char **argv) >> /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */ >> qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix); >> qtest_add_func("/migration/multifd/tcp/none", test_multifd_tcp_none); >>+ qtest_add_func("/migration/multifd/tcp/zlib", test_multifd_tcp_zlib); > > Actually zlib is not enabled at this moment, the test here may not touch the > real functionality. It is, see what the test_multifd_tcp("zlib"); line does for: static void test_multifd_tcp(const char *method) { .... migrate_set_parameter_str(from, "multifd-compress", method); migrate_set_parameter_str(to, "multifd-compress", method); ... } Thanks, Juan.