diff options
| author | Xiao Guangrong <xiaoguangrong@tencent.com> | 2018-08-21 16:10:23 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-08-22 12:36:18 +0200 |
| commit | 6ef3771c0d070e8f16e12f21e4fbf1ec6459eff6 (patch) | |
| tree | 8beb28b6aa95d66f9c2a948ded95ca0d4feab414 /migration/ram.c | |
| parent | 6c97ec5f5ad6f65f8a6a9be044c2b875972406e4 (diff) | |
| download | qemu-6ef3771c0d070e8f16e12f21e4fbf1ec6459eff6.zip qemu-6ef3771c0d070e8f16e12f21e4fbf1ec6459eff6.tar.gz qemu-6ef3771c0d070e8f16e12f21e4fbf1ec6459eff6.tar.bz2 | |
migration: drop the return value of do_compress_ram_page
It is not used and cleans the code up a little
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/migration/ram.c b/migration/ram.c index 8ffa0a6..11066df 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -382,8 +382,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) { @@ -1849,15 +1849,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 @@ -1865,17 +1864,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) |