[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/10] migration: drop the return value of do_com
From: |
guangrong . xiao |
Subject: |
[Qemu-devel] [PATCH v3 04/10] migration: drop the return value of do_compress_ram_page |
Date: |
Tue, 7 Aug 2018 17:12:03 +0800 |
From: Xiao Guangrong <address@hidden>
It is not used and cleans the code up a little
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Xiao Guangrong <address@hidden>
---
migration/ram.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 49ace30614..e463de4f69 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -381,8 +381,8 @@ static QemuThread *decompress_threads;
static QemuMutex decomp_done_lock;
static QemuCond decomp_done_cond;
-static int do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
- ram_addr_t offset, uint8_t *source_buf);
+static void do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock
*block,
+ ram_addr_t offset, uint8_t *source_buf);
static void *do_data_compress(void *opaque)
{
@@ -1842,15 +1842,14 @@ static int ram_save_multifd_page(RAMState *rs, RAMBlock
*block,
return 1;
}
-static int do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,
- ram_addr_t offset, uint8_t *source_buf)
+static void do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock
*block,
+ ram_addr_t offset, uint8_t *source_buf)
{
RAMState *rs = ram_state;
- int bytes_sent, blen;
uint8_t *p = block->host + (offset & TARGET_PAGE_MASK);
+ int ret;
- bytes_sent = save_page_header(rs, f, block, offset |
- RAM_SAVE_FLAG_COMPRESS_PAGE);
+ save_page_header(rs, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE);
/*
* copy it to a internal buffer to avoid it being modified by VM
@@ -1858,17 +1857,14 @@ static int do_compress_ram_page(QEMUFile *f, z_stream
*stream, RAMBlock *block,
* decompression
*/
memcpy(source_buf, p, TARGET_PAGE_SIZE);
- blen = qemu_put_compression_data(f, stream, source_buf, TARGET_PAGE_SIZE);
- if (blen < 0) {
- bytes_sent = 0;
- qemu_file_set_error(migrate_get_current()->to_dst_file, blen);
+ ret = qemu_put_compression_data(f, stream, source_buf, TARGET_PAGE_SIZE);
+ if (ret < 0) {
+ qemu_file_set_error(migrate_get_current()->to_dst_file, ret);
error_report("compressed data failed!");
- } else {
- bytes_sent += blen;
- ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
+ return;
}
- return bytes_sent;
+ ram_release_pages(block->idstr, offset & TARGET_PAGE_MASK, 1);
}
static void flush_compressed_data(RAMState *rs)
--
2.14.4
- [Qemu-devel] [PATCH v3 00/10] migration: compression optimization, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 02/10] migration: fix counting normal page for compression, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 03/10] migration: introduce save_zero_page_to_file, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 04/10] migration: drop the return value of do_compress_ram_page,
guangrong . xiao <=
- [Qemu-devel] [PATCH v3 05/10] migration: move handle of zero page to the thread, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 06/10] migration: hold the lock only if it is really needed, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 07/10] migration: do not flush_compressed_data at the end of each iteration, guangrong . xiao, 2018/08/07
- [Qemu-devel] [PATCH v3 08/10] migration: handle the error condition properly, guangrong . xiao, 2018/08/07