From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4hWv-0006pt-23 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 22:59:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4hWr-0004oB-QQ for qemu-devel@nongnu.org; Thu, 03 Dec 2015 22:59:32 -0500 Received: from mga11.intel.com ([192.55.52.93]:7592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4hWr-0004o5-KX for qemu-devel@nongnu.org; Thu, 03 Dec 2015 22:59:29 -0500 From: Liang Li Date: Fri, 4 Dec 2015 11:52:07 +0800 Message-Id: <1449201128-22779-2-git-send-email-liang.z.li@intel.com> In-Reply-To: <1449201128-22779-1-git-send-email-liang.z.li@intel.com> References: <1449201128-22779-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [PATCH 1/2] qemu-file: fix flaws of qemu_put_compression_data List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Liang Li , mit.shah@redhat.com, dgilbert@redhat.com, quintela@redhat.com There are some flaws in qemu_put_compression_data, this patch tries to fix it. Now it can be used by other code. Signed-off-by: Liang Li --- 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 0bbd257..ef9cd4a 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -616,7 +616,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) { @@ -624,7 +626,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