migration: remove ram_save_compressed_page()
Now, we can reuse the path in ram_save_page() to post the page out as normal, then the only thing remained in ram_save_compressed_page() is compression that we can move it out to the caller Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com> Message-Id: <20180330075128.26919-11-xiaoguangrong@tencent.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
65dacaa04f
commit
da3f56cb2e
|
@ -1184,41 +1184,6 @@ static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block,
|
||||||
return pages;
|
return pages;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ram_save_compressed_page: compress the given page and send it to the stream
|
|
||||||
*
|
|
||||||
* Returns the number of pages written.
|
|
||||||
*
|
|
||||||
* @rs: current RAM state
|
|
||||||
* @block: block that contains the page we want to send
|
|
||||||
* @offset: offset inside the block for the page
|
|
||||||
* @last_stage: if we are at the completion stage
|
|
||||||
*/
|
|
||||||
static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
|
|
||||||
bool last_stage)
|
|
||||||
{
|
|
||||||
int pages = -1;
|
|
||||||
uint8_t *p;
|
|
||||||
RAMBlock *block = pss->block;
|
|
||||||
ram_addr_t offset = pss->page << TARGET_PAGE_BITS;
|
|
||||||
|
|
||||||
p = block->host + offset;
|
|
||||||
|
|
||||||
if (block != rs->last_sent_block) {
|
|
||||||
/*
|
|
||||||
* Make sure the first page is sent out before other pages.
|
|
||||||
*
|
|
||||||
* we post it as normal page as compression will take much
|
|
||||||
* CPU resource.
|
|
||||||
*/
|
|
||||||
pages = save_normal_page(rs, block, offset, p, true);
|
|
||||||
} else {
|
|
||||||
pages = compress_page_with_multi_thread(rs, block, offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pages;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* find_dirty_block: find the next dirty page and update any state
|
* find_dirty_block: find the next dirty page and update any state
|
||||||
* associated with the search process.
|
* associated with the search process.
|
||||||
|
@ -1518,8 +1483,14 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (save_page_use_compression(rs)) {
|
/*
|
||||||
return ram_save_compressed_page(rs, pss, last_stage);
|
* Make sure the first page is sent out before other pages.
|
||||||
|
*
|
||||||
|
* we post it as normal page as compression will take much
|
||||||
|
* CPU resource.
|
||||||
|
*/
|
||||||
|
if (block == rs->last_sent_block && save_page_use_compression(rs)) {
|
||||||
|
res = compress_page_with_multi_thread(rs, block, offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ram_save_page(rs, pss, last_stage);
|
return ram_save_page(rs, pss, last_stage);
|
||||||
|
|
Loading…
Reference in a new issue