[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] migration: refine ram_save_compressed_page
From: |
Liang Li |
Subject: |
[Qemu-devel] [PATCH v2 5/9] migration: refine ram_save_compressed_page |
Date: |
Thu, 5 May 2016 15:32:55 +0800 |
Use qemu_put_compression_data to do the compression directly
instead of using do_compress_ram_page, avoid some data copy.
very small improvement, at the same time, add code to check
if the compression is successful.
Signed-off-by: Liang Li <address@hidden>
---
migration/ram.c | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 8a21c2c..1a45227 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -929,24 +929,20 @@ static int ram_save_compressed_page(QEMUFile *f,
PageSearchStatus *pss,
uint64_t *bytes_transferred)
{
int pages = -1;
- uint64_t bytes_xmit;
+ uint64_t bytes_xmit = 0;
uint8_t *p;
- int ret;
+ int ret, blen;
RAMBlock *block = pss->block;
ram_addr_t offset = pss->offset;
p = block->host + offset;
- bytes_xmit = 0;
ret = ram_control_save_page(f, block->offset,
offset, TARGET_PAGE_SIZE, &bytes_xmit);
if (bytes_xmit) {
*bytes_transferred += bytes_xmit;
pages = 1;
}
- if (block == last_sent_block) {
- offset |= RAM_SAVE_FLAG_CONTINUE;
- }
if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
if (ret != RAM_SAVE_CONTROL_DELAYED) {
if (bytes_xmit > 0) {
@@ -966,19 +962,22 @@ static int ram_save_compressed_page(QEMUFile *f,
PageSearchStatus *pss,
flush_compressed_data(f);
pages = save_zero_page(f, block, offset, p, bytes_transferred);
if (pages == -1) {
- set_compress_params(&comp_param[0], block, offset);
- /* Use the qemu thread to compress the data to make sure the
- * first page is sent out before other pages
- */
- bytes_xmit = do_compress_ram_page(&comp_param[0]);
- if (bytes_xmit > 0) {
+ /* Make sure the first page is sent out before other pages */
+ bytes_xmit = save_page_header(f, block, offset |
+ RAM_SAVE_FLAG_COMPRESS_PAGE);
+ blen = qemu_put_compression_data(f, p, TARGET_PAGE_SIZE,
+ migrate_compress_level());
+ if (blen > 0) {
+ *bytes_transferred += bytes_xmit + blen;
acct_info.norm_pages++;
- qemu_put_qemu_file(f, comp_param[0].file);
- *bytes_transferred += bytes_xmit;
pages = 1;
+ } else {
+ qemu_file_set_error(f, blen);
+ error_report("compressed data failed!");
}
}
} else {
+ offset |= RAM_SAVE_FLAG_CONTINUE;
pages = save_zero_page(f, block, offset, p, bytes_transferred);
if (pages == -1) {
pages = compress_page_with_multi_thread(f, block, offset,
--
1.9.1
- [Qemu-devel] [PATCH v2 0/9] live migration bug fix and refine, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 1/9] migration: Fix multi-thread compression bug, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 2/9] migration: Fix a potential issue, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 3/9] migration: remove useless code, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 6/9] migration: protect the quit flag by lock, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 7/9] migration: refine the compression code, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 4/9] qemu-file: Fix qemu_put_compression_data flaw, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 8/9] migration: refine the decompression code, Liang Li, 2016/05/05
- [Qemu-devel] [PATCH v2 5/9] migration: refine ram_save_compressed_page,
Liang Li <=
- [Qemu-devel] [PATCH v2 9/9] migration: code clean up, Liang Li, 2016/05/05
- Re: [Qemu-devel] [PATCH v2 0/9] live migration bug fix and refine, Amit Shah, 2016/05/23