[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/18] migration/compress: compress QEMUFile is not writable
From: |
Juan Quintela |
Subject: |
[PULL 18/18] migration/compress: compress QEMUFile is not writable |
Date: |
Wed, 29 Jan 2020 12:15:36 +0100 |
From: Wei Yang <address@hidden>
We open a file with empty_ops for compress QEMUFile, which means this is
not writable.
Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/qemu-file.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index bbb2b63927..1c3a358a14 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -764,11 +764,8 @@ static int qemu_compress_data(z_stream *stream, uint8_t
*dest, size_t dest_len,
/* Compress size bytes of data start at p and store the compressed
* data to the buffer of f.
*
- * When f is not writable, return -1 if f has no space to save the
- * compressed data.
- * When f is wirtable and it has no space to save the compressed data,
- * do fflush first, if f still has no space to save the compressed
- * data, return -1.
+ * Since the file is dummy file with empty_ops, return -1 if f has no space to
+ * save the compressed data.
*/
ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
const uint8_t *p, size_t size)
@@ -776,14 +773,7 @@ ssize_t qemu_put_compression_data(QEMUFile *f, z_stream
*stream,
ssize_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int32_t);
if (blen < compressBound(size)) {
- if (!qemu_file_is_writable(f)) {
- return -1;
- }
- qemu_fflush(f);
- blen = IO_BUF_SIZE - sizeof(int32_t);
- if (blen < compressBound(size)) {
- return -1;
- }
+ return -1;
}
blen = qemu_compress_data(stream, f->buf + f->buf_index + sizeof(int32_t),
--
2.24.1
- [PULL 05/18] migration-test: Make sure that multifd and cancel works, (continued)
- [PULL 05/18] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/29
- [PULL 06/18] migration: Create migration_is_running(), Juan Quintela, 2020/01/29
- [PULL 11/18] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 10/18] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 09/18] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 15/18] multifd: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 12/18] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/29
- [PULL 13/18] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/29
- [PULL 17/18] migration: Simplify get_qlist, Juan Quintela, 2020/01/29
- [PULL 18/18] migration/compress: compress QEMUFile is not writable,
Juan Quintela <=
- [PULL 07/18] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/29
- [PULL 08/18] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/29
- [PULL 16/18] multifd: Split multifd code into its own file, Juan Quintela, 2020/01/29
- Re: [PULL 00/18] Pull migration patches, Peter Maydell, 2020/01/30