[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] migration: code clean up.
From: |
Liang Li |
Subject: |
[Qemu-devel] [PATCH 2/2] migration: code clean up. |
Date: |
Fri, 4 Dec 2015 11:53:10 +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, but the code looks better.
Signed-off-by: Liang Li <address@hidden>
---
migration/ram.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 1eb155a..44b3edc 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -911,22 +911,18 @@ static int ram_save_compressed_page(QEMUFile *f, RAMBlock
*block,
uint64_t *bytes_transferred)
{
int pages = -1;
- uint64_t bytes_xmit;
+ uint64_t bytes_xmit = 0;
uint8_t *p;
int ret;
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) {
@@ -946,17 +942,17 @@ static int ram_save_compressed_page(QEMUFile *f, RAMBlock
*block,
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]);
- acct_info.norm_pages++;
- qemu_put_qemu_file(f, comp_param[0].file);
+ /* Make sure the first page is sent out before other pages */
+ bytes_xmit = save_page_header(f, block, offset |
+ RAM_SAVE_FLAG_COMPRESS_PAGE);
+ bytes_xmit += qemu_put_compression_data(f, p, TARGET_PAGE_SIZE,
+ migrate_compress_level());
*bytes_transferred += bytes_xmit;
+ acct_info.norm_pages++;
pages = 1;
}
} 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
- Re: [Qemu-devel] [PATCH 1/2] qemu-file: fix flaws of qemu_put_compression_data, (continued)
Re: [Qemu-devel] [PATCH 1/2] qemu-file: fix flaws of qemu_put_compression_data, Stefan Hajnoczi, 2015/12/07
Re: [Qemu-devel] [PATCH 1/2] qemu-file: fix flaws of qemu_put_compression_data, Stefan Hajnoczi, 2015/12/07
Re: [Qemu-devel] [PATCH 0/2] fix the flaws of qemu_put_compression_data, Juan Quintela, 2015/12/04
[Qemu-devel] [PATCH 0/2] fix the flaws of qemu_put_compression_data, Liang Li, 2015/12/03