From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
Juan Quintela <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Wei Yang <richardw.yang@linux.intel.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 18/18] migration/compress: compress QEMUFile is not writable
Date: Wed, 29 Jan 2020 12:15:36 +0100 [thread overview]
Message-ID: <20200129111536.9497-19-quintela@redhat.com> (raw)
In-Reply-To: <20200129111536.9497-1-quintela@redhat.com>
From: Wei Yang <richardw.yang@linux.intel.com>
We open a file with empty_ops for compress QEMUFile, which means this is
not writable.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
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
next prev parent reply other threads:[~2020-01-29 11:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 11:15 [PULL 00/18] Pull migration patches Juan Quintela
2020-01-29 11:15 ` [PULL 01/18] migration-test: Use g_free() instead of free() Juan Quintela
2020-01-29 11:15 ` [PULL 02/18] multifd: Make sure that we don't do any IO after an error Juan Quintela
2020-01-29 11:15 ` [PULL 03/18] qemu-file: Don't do IO after shutdown Juan Quintela
2020-01-29 11:15 ` [PULL 04/18] migration: Don't send data if we have stopped Juan Quintela
2020-01-29 11:15 ` [PULL 05/18] migration-test: Make sure that multifd and cancel works Juan Quintela
2020-01-29 11:15 ` [PULL 06/18] migration: Create migration_is_running() Juan Quintela
2020-01-29 11:15 ` [PULL 07/18] migration/multifd: fix nullptr access in multifd_send_terminate_threads Juan Quintela
2020-01-29 11:15 ` [PULL 08/18] ram_addr: Split RAMBlock definition Juan Quintela
2020-01-29 11:15 ` [PULL 09/18] multifd: multifd_send_pages only needs the qemufile Juan Quintela
2020-01-29 11:15 ` [PULL 10/18] multifd: multifd_queue_page " Juan Quintela
2020-01-29 11:15 ` [PULL 11/18] multifd: multifd_send_sync_main " Juan Quintela
2020-01-29 11:15 ` [PULL 12/18] multifd: Use qemu_target_page_size() Juan Quintela
2020-01-29 11:15 ` [PULL 13/18] migration: Make checkpatch happy with comments Juan Quintela
2020-01-29 11:15 ` [PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter Juan Quintela
2020-01-29 11:15 ` [PULL 15/18] multifd: Make multifd_load_setup() " Juan Quintela
2020-01-29 11:15 ` [PULL 16/18] multifd: Split multifd code into its own file Juan Quintela
2020-01-29 11:15 ` [PULL 17/18] migration: Simplify get_qlist Juan Quintela
2020-01-29 11:15 ` Juan Quintela [this message]
2020-01-30 13:12 ` [PULL 00/18] Pull migration patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200129111536.9497-19-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richardw.yang@linux.intel.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).