[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] qemu-file: improve qemu_put_compression_data
From: |
Liang Li |
Subject: |
[Qemu-devel] [PATCH 1/3] qemu-file: improve qemu_put_compression_data |
Date: |
Tue, 25 Aug 2015 19:59:08 +0800 |
There are some flaws in qemu_put_compression_data so that it can't not operate
on an normal QEMUFile, improve it so as to use it later.
Signed-off-by: Liang Li <address@hidden>
---
migration/qemu-file.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 6bb3dc1..59967b6 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -567,7 +567,9 @@ ssize_t qemu_put_compression_data(QEMUFile *f, const
uint8_t *p, size_t size,
ssize_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int32_t);
if (blen < compressBound(size)) {
- return 0;
+ if (f->ops->writev_buffer || f->ops->put_buffer) {
+ qemu_fflush(f);
+ }
}
if (compress2(f->buf + f->buf_index + sizeof(int32_t), (uLongf *)&blen,
(Bytef *)p, size, level) != Z_OK) {
@@ -575,7 +577,13 @@ ssize_t qemu_put_compression_data(QEMUFile *f, const
uint8_t *p, size_t size,
return 0;
}
qemu_put_be32(f, blen);
+ if (f->ops->writev_buffer) {
+ add_to_iovec(f, f->buf + f->buf_index, blen);
+ }
f->buf_index += blen;
+ if (f->buf_index == IO_BUF_SIZE) {
+ qemu_fflush(f);
+ }
return blen + sizeof(int32_t);
}
--
1.9.1