From patchwork Tue Apr 4 14:35:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1765022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=lukasstraub2@web.de header.a=rsa-sha256 header.s=s29768273 header.b=eXTfif3t; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PrVgc2CSvz1yZQ for ; Wed, 5 Apr 2023 00:36:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjhlD-00073R-GU; Tue, 04 Apr 2023 10:35:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjhlB-000738-LG for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:35:45 -0400 Received: from mout.web.de ([212.227.15.14]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjhl9-0005NB-NE for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:35:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1680618937; i=lukasstraub2@web.de; bh=s0Lcg0rRLB6m+2pzNGnotaTSSpHMe5TOmLpFADUMnUw=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject; b=eXTfif3tLlBIfv8sx3pBbCSWyZaQAJEbnKvh+QPACM7SRk81K2k0YpallP4aIaMtj 1weoiTNLEtLzW65KgIoR0LHRhQYgNgQWb8UXOuGq5UFzpIYvv9DZ/9U+GlexIsWmK3 a8qTIj84EtNvlVnQeYIuj3QlLQquj3bKl8FAtxa7uVXyltfKPdYbMh5huVL7wrFd5+ lrppphLnUZ8aBYP1E2T6QNFQaS9O3WT+xVSzv5qhRB8VwnSdKqYCZzNehjkdpdVFya KMwkqCM/QF1amegIoZsvIIHrKAT1hjednh7Y6ufPc/6GXUhViLLRlOqFOP80vyzT6K jl2NyWeaKa18w== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from gecko.fritz.box ([82.207.254.102]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1N2jaS-1qOZtN1Z1g-013Iml; Tue, 04 Apr 2023 16:35:37 +0200 Date: Tue, 4 Apr 2023 14:35:27 +0000 From: Lukas Straub To: qemu-devel Cc: "Dr. David Alan Gilbert" , Juan Quintela , Peter Xu , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH for-8.0 v2 1/2] qtest/migration-test.c: Add tests with compress enabled Message-ID: <2f4abb67cf5f3e1591b2666676462a93bdd20bbc.1680618040.git.lukasstraub2@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:BD4QU++qaWP46izr+U3OKQfcbVtwcoQ4oRX19vebF6hW+kPAbrE XZxdBhFZ25rOW9HKO9JK7+xDMOhF3BFnxGos9aqFlSBx6WF9WFBDZp5ZCJ6h2T+ZSumFMey uDb5o9ZaQ95aBXyS0fWAs0sp0tiDtgYuuwt/iigJ60VQYK5fzqI+3u2g1WE5axBTKz11G0p urXTwCG9cG/V9wI9ox60Q== UI-OutboundReport: notjunk:1;M01:P0:INyjCGUUccE=;E8lXNXtAwEN0yMZLZsnSJu7e/3K ceLTq/7dbZnY7RbjKcDeakhwkUsUWdWWvyZ3WFCUvLC9Sm0+dAaAXhr46I4jXKO8hlupr3tiu oQITKKzIi5/yIon12CHwuwtTerBMROhBmA3wypXLUE4RAWXhDUuFyON8umO0RRjhlBNpvz9g1 b7Whz1vM6pHhco45O66Wlbboat6p3Zbb9wFttMDix3aVur2/hMrjfFNzqLdhiI0nRlE6NZ7r4 sxcGLj1hevNNr9C7RFkuMx/cAi+GjrTo3SRf2bTNDCPMYWyJtFxekyDMlva8hWCWMUjGJcLng V33lwhSQL2EqOUE9HjrLdJECCStWBreO/yA66X4W0AXal6KLjTCVm9zgG2YggNoM8H9IZT40J mEtWMcgQjc9SNWufra4h55JoNFu+s1L1lZAHsJbdwNMIunM3BsJfm0p+z3bF56xxvZFPx2w+q awVW4uAiJlPxdFe2AKXbEELQnclajipvajtP1r0lMhkMYrmwZR4/RYvG9JUnsxZLOHwhOv88p sPMyaFMUQPQPVWL763LHMDS0FzuI4MCt/ZrgzxTO6N/CcRi0j2kpAOPhlgZ3k2w9vhxEWuSZt Tw7tMyH09bnONetErnQ8AF7InHsFYXBlEuQLpVflxKymmcjw6t1bMLGiEcqc2SxDbrmCm1dUN iK318vmsprmXxsHVplXAaNqmlUVS0QthsjmM+jaEA3ioWuoKJ129gFS6Y7NEHHcVBqs5ZsEna qEiEFauzn9W1rUhJRo/rMAJq0KIKiV0EOlLSjwfapJihpIPtT1ROv1x9TTKGEVQ13EKmtKTSX DFKl8nVZRUrad0hRTjuJx5W2+gce3INDT4oZD6QpQcpNJGVTGMqqge+qzXqw+4nWdBUXmnzV3 HVL8n4j98bzN5kZ+rJvDxvTmDoF7HeVNaUCg0dA/g/ZdmKvK5wUD1cPg//ILmEIlm6qoZ06ay 7khUOQPc7szkiDEGeE0e+rfXD88= Received-SPF: pass client-ip=212.227.15.14; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There has never been tests for migration with compress enabled. Add suitable tests, testing with compress-wait-thread = false too. Signed-off-by: Lukas Straub Acked-by: Peter Xu Reviewed-by: Juan Quintela --- v2: - Split into 2 tests, one with compress-wait-thread = true and faster compress options. And one with compress-wait-thread = false and slower compress options, so it definitely sends some pages uncompressed. - Add comment for iterations = 2. tests/qtest/migration-test.c | 103 +++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 3b615b0da9..1f2a019ce0 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -406,6 +406,41 @@ static void migrate_set_parameter_str(QTestState *who, const char *parameter, migrate_check_parameter_str(who, parameter, value); } +static long long migrate_get_parameter_bool(QTestState *who, + const char *parameter) +{ + QDict *rsp; + int result; + + rsp = wait_command(who, "{ 'execute': 'query-migrate-parameters' }"); + result = qdict_get_bool(rsp, parameter); + qobject_unref(rsp); + return !!result; +} + +static void migrate_check_parameter_bool(QTestState *who, const char *parameter, + int value) +{ + int result; + + result = migrate_get_parameter_bool(who, parameter); + g_assert_cmpint(result, ==, value); +} + +static void migrate_set_parameter_bool(QTestState *who, const char *parameter, + int value) +{ + QDict *rsp; + + rsp = qtest_qmp(who, + "{ 'execute': 'migrate-set-parameters'," + "'arguments': { %s: %i } }", + parameter, value); + g_assert(qdict_haskey(rsp, "return")); + qobject_unref(rsp); + migrate_check_parameter_bool(who, parameter, value); +} + static void migrate_ensure_non_converge(QTestState *who) { /* Can't converge with 1ms downtime + 3 mbs bandwidth limit */ @@ -1524,6 +1559,70 @@ static void test_precopy_unix_xbzrle(void) test_precopy_common(&args); } +static void * +test_migrate_compress_start(QTestState *from, + QTestState *to) +{ + migrate_set_parameter_int(from, "compress-level", 1); + migrate_set_parameter_int(from, "compress-threads", 4); + migrate_set_parameter_bool(from, "compress-wait-thread", true); + migrate_set_parameter_int(to, "decompress-threads", 4); + + migrate_set_capability(from, "compress", true); + migrate_set_capability(to, "compress", true); + + return NULL; +} + +static void test_precopy_unix_compress(void) +{ + g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); + MigrateCommon args = { + .connect_uri = uri, + .listen_uri = uri, + .start_hook = test_migrate_compress_start, + /* + * Test that no invalid thread state is left over from + * the previous iteration. + */ + .iterations = 2, + }; + + test_precopy_common(&args); +} + +static void * +test_migrate_compress_nowait_start(QTestState *from, + QTestState *to) +{ + migrate_set_parameter_int(from, "compress-level", 9); + migrate_set_parameter_int(from, "compress-threads", 1); + migrate_set_parameter_bool(from, "compress-wait-thread", false); + migrate_set_parameter_int(to, "decompress-threads", 1); + + migrate_set_capability(from, "compress", true); + migrate_set_capability(to, "compress", true); + + return NULL; +} + +static void test_precopy_unix_compress_nowait(void) +{ + g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); + MigrateCommon args = { + .connect_uri = uri, + .listen_uri = uri, + .start_hook = test_migrate_compress_nowait_start, + /* + * Test that no invalid thread state is left over from + * the previous iteration. + */ + .iterations = 2, + }; + + test_precopy_common(&args); +} + static void test_precopy_tcp_plain(void) { MigrateCommon args = { @@ -2515,6 +2614,10 @@ int main(int argc, char **argv) qtest_add_func("/migration/bad_dest", test_baddest); qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); + qtest_add_func("/migration/precopy/unix/compress/wait", + test_precopy_unix_compress); + qtest_add_func("/migration/precopy/unix/compress/nowait", + test_precopy_unix_compress_nowait); #ifdef CONFIG_GNUTLS qtest_add_func("/migration/precopy/unix/tls/psk", test_precopy_unix_tls_psk); From patchwork Tue Apr 4 14:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1765023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=lukasstraub2@web.de header.a=rsa-sha256 header.s=s29768273 header.b=o4x3alFQ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PrVgv12NVz1yZQ for ; Wed, 5 Apr 2023 00:36:27 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjhlh-0007aP-N0; Tue, 04 Apr 2023 10:36:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjhlf-0007Z9-CQ for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:36:15 -0400 Received: from mout.web.de ([212.227.15.3]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjhlb-0005WR-U6 for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:36:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1680618965; i=lukasstraub2@web.de; bh=1Uc1GejUrfx0MLB/D7QKtrjGVaAz2I225ybeOKSqUKk=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=o4x3alFQhsTW4Ne4b7o2pC0b+P2LklHNFYYoLd8/hSbDGgrHH/8h0JNzcvRUyo56Q p/QBKisknw3cyrYcpVx9lyIaL32cVn7sCACQk6cSPnvOx3q7sjHtYQSzlbYGudL4ox FiRdBhZvvE6yfT5q68Y2KC75yMfG6GUtjgBRerlfdKApKHcoJXY5nxkePDoTHgifVu SCqLJ1uGRJ3vnksinyyq9xteWMrLNBnz+E7i3t1Ws/3F1zGP5X22uC87EFyS8pmetC a32c8BqWFjfle7vGGw3JMdewutIR4va8p4wkmbZYbqYP+EYcdid5A045F16UdKC2ob g4BVCYLCwpOew== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from gecko.fritz.box ([82.207.254.102]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MwR05-1qZsPY08RR-00rzq1; Tue, 04 Apr 2023 16:36:05 +0200 Date: Tue, 4 Apr 2023 14:36:03 +0000 From: Lukas Straub To: qemu-devel Cc: "Dr. David Alan Gilbert" , Juan Quintela , Peter Xu , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH for-8.0 v2 2/2] migration/ram.c: Fix migration with compress enabled Message-ID: <2c4cac0ca620ea0304d88b8f5110fe290400c8c8.1680618040.git.lukasstraub2@web.de> In-Reply-To: <2f4abb67cf5f3e1591b2666676462a93bdd20bbc.1680618040.git.lukasstraub2@web.de> References: <2f4abb67cf5f3e1591b2666676462a93bdd20bbc.1680618040.git.lukasstraub2@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:UYABQygXjINGT2Dy7+IcjheoyY2Gf+UnfkYiQcYIil7eNZxVIXZ QRLI9ZVCWIal+1mi4FiEB0fuuBl9bvgQRPnbbHOJowJPXEzduKs9ZWAFElPINuuHUUa4FXO 9Gq3x5lSpwrQJjWvXUokZwrG5Ff6HS3FTW5RQQ6gT287ZTbEbTKmdbV+BXT0ou6xlaa3Ryo 5EdR2+OGW3hMaTJccWY3A== UI-OutboundReport: notjunk:1;M01:P0:hBwdjc8rav8=;da8v6kiUAdf3fLgUV8Zxh6I87Dt HvlAIN0T1StLZfR4q1e0e0mw5vSb75GfHUmDpL9uAdqXqN3jJL0zRXcSSCcamQe0VxWbAEWud ZKtGfIEG7bngBFDRZWr7caQx/o78FVl1SOzSVSzCj0k8Qs1UZKus0fAJBaHvLWXIp2Sar9J3h Yg4+MNZcauoswhobozrHcGZAxSJrZjW7Vt1Nx8hmHxGjyJHKfc5CW4KTMpgGyZaPfn8BjRm0/ qtueeYjg3gXjuwT9gxt3zoxUyRdCugBRdCznsxAOgf8yDxE+GRskCMxjWXk9tGWcHDhvMHhje Vc7bixtBxLCewr9by4cxDuavTz8yOuc07F7k/hOATPaTS/XT0UqTlUe0u2hL27E9M/2yDqmOo F0XraMRah6+EiWIbJlXRjwvCx9TYxKOoRUuubODjTINmGB8CF1SRMUUxqXbRQwf3Gg5Q5oseK EsFAaXilMsZB0yqQUr8hedB/8zBuMHf//Xw66jJ2URpsuQFgHRh74gKVQnv8AP0HchAAfQ18W yNMkH/VZE2IKaOApAUbtJL7nqHPSqzPVXGIp6jnfmPgbRImnzllpk0wXN1zMdUMgIsFvtZF8i 4j/R/KWxGfHuQpheS4TaZVy2qKY6BObWUgwU8UfqkDhDh2NdTqP+WFoPnhfcwox1VVQccdpNY rM/qHuzJT+RFjeVzKyRI3D07qRJkfIt0LeLrQNfLdlPAcZvqdcm54LaRVk3SZeVRtEoGf7IfU eOYYOaCnz1prU7g6vDspw/4w+IRjg4B9aZUKNYiXpgABdeLTIz0+FUl+KkG8+K79IAcZWsVm4 eAJp8XFgx02nrXk0uQQvJ2mYT2d43ZaRvSqh78F1qTb78YtBSjOGPMY1e+alM39PLvLptxbbJ phIYxvssrHEzvYPK5V/yEwKVmveAS+pGth+jTg7M180+6/K0mBzChRXTj3Kj4Qaf2t7BhJSfR kxWHOA== Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Since ec6f3ab9, migration with compress enabled was broken, because the compress threads use a dummy QEMUFile which just acts as a buffer and that commit accidentally changed it to use the outgoing migration channel instead. Fix this by using the dummy file again in the compress threads. Fixes: ec6f3ab9f4 ("migration: Move last_sent_block into PageSearchStatus") Signed-off-by: Lukas Straub Reviewed-by: Peter Xu --- v2: - Add Fixed: and Reviewed-by: tags migration/ram.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 96e8a19a58..9d1817ab7b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -688,12 +688,11 @@ exit: * @offset: offset inside the block for the page * in the lower bits, it contains flags */ -static size_t save_page_header(PageSearchStatus *pss, RAMBlock *block, - ram_addr_t offset) +static size_t save_page_header(PageSearchStatus *pss, QEMUFile *f, + RAMBlock *block, ram_addr_t offset) { size_t size, len; bool same_block = (block == pss->last_sent_block); - QEMUFile *f = pss->pss_channel; if (same_block) { offset |= RAM_SAVE_FLAG_CONTINUE; @@ -867,7 +866,7 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss, } /* Send XBZRLE based compressed page */ - bytes_xbzrle = save_page_header(pss, block, + bytes_xbzrle = save_page_header(pss, pss->pss_channel, block, offset | RAM_SAVE_FLAG_XBZRLE); qemu_put_byte(file, ENCODING_FLAG_XBZRLE); qemu_put_be16(file, encoded_len); @@ -1302,15 +1301,14 @@ void ram_release_page(const char *rbname, uint64_t offset) * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file(PageSearchStatus *pss, +static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, RAMBlock *block, ram_addr_t offset) { uint8_t *p = block->host + offset; - QEMUFile *file = pss->pss_channel; int len = 0; if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { - len += save_page_header(pss, block, offset | RAM_SAVE_FLAG_ZERO); + len += save_page_header(pss, file, block, offset | RAM_SAVE_FLAG_ZERO); qemu_put_byte(file, 0); len += 1; ram_release_page(block->idstr, offset); @@ -1327,10 +1325,10 @@ static int save_zero_page_to_file(PageSearchStatus *pss, * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, RAMBlock *block, +static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *block, ram_addr_t offset) { - int len = save_zero_page_to_file(pss, block, offset); + int len = save_zero_page_to_file(pss, f, block, offset); if (len) { stat64_add(&ram_atomic_counters.duplicate, 1); @@ -1394,7 +1392,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block, { QEMUFile *file = pss->pss_channel; - ram_transferred_add(save_page_header(pss, block, + ram_transferred_add(save_page_header(pss, pss->pss_channel, block, offset | RAM_SAVE_FLAG_PAGE)); if (async) { qemu_put_buffer_async(file, buf, TARGET_PAGE_SIZE, @@ -1473,11 +1471,11 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block, uint8_t *p = block->host + offset; int ret; - if (save_zero_page_to_file(pss, block, offset)) { + if (save_zero_page_to_file(pss, f, block, offset)) { return true; } - save_page_header(pss, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE); + save_page_header(pss, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE); /* * copy it to a internal buffer to avoid it being modified by VM @@ -2355,7 +2353,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) return 1; } - res = save_zero_page(pss, block, offset); + res = save_zero_page(pss, pss->pss_channel, block, offset); if (res > 0) { /* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale