[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND 4/7] migration/ram: Stop passing QEMUFile around in save_z
From: |
Fabiano Rosas |
Subject: |
[PATCH RESEND 4/7] migration/ram: Stop passing QEMUFile around in save_zero_page |
Date: |
Wed, 11 Oct 2023 15:46:01 -0300 |
We don't need the QEMUFile when we're already passing the
PageSearchStatus.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/ram.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index cd765212af..c8474f6fd8 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1146,10 +1146,11 @@ 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, QEMUFile *file,
- RAMBlock *block, ram_addr_t offset)
+static int save_zero_page_to_file(PageSearchStatus *pss, 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)) {
@@ -1170,10 +1171,10 @@ static int save_zero_page_to_file(PageSearchStatus
*pss, QEMUFile *file,
* @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, QEMUFile *f, RAMBlock *block,
+static int save_zero_page(PageSearchStatus *pss, RAMBlock *block,
ram_addr_t offset)
{
- int len = save_zero_page_to_file(pss, f, block, offset);
+ int len = save_zero_page_to_file(pss, block, offset);
if (len) {
stat64_add(&mig_stats.zero_pages, 1);
@@ -2136,7 +2137,7 @@ static int ram_save_target_page_legacy(RAMState *rs,
PageSearchStatus *pss)
return 1;
}
- res = save_zero_page(pss, pss->pss_channel, block, offset);
+ res = save_zero_page(pss, block, offset);
if (res > 0) {
/* Must let xbzrle know, otherwise a previous (now 0'd) cached
* page would be stale
--
2.35.3
- [PATCH RESEND 0/7] migration pending patches, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 3/7] migration/ram: Remove RAMState from xbzrle_cache_zero_page, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 4/7] migration/ram: Stop passing QEMUFile around in save_zero_page,
Fabiano Rosas <=
- [PATCH RESEND 1/7] tests/qtest: migration-test: Add tests for file-based migration, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 6/7] migration/ram: Merge save_zero_page functions, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 5/7] migration/ram: Move xbzrle zero page handling into save_zero_page, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 7/7] tests/qtest: Re-enable multifd cancel test, Fabiano Rosas, 2023/10/11
- [PATCH RESEND 2/7] migration/ram: Refactor precopy ram loading code, Fabiano Rosas, 2023/10/11