From patchwork Mon Feb 2 11:05:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 435415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A8F6D1402A7 for ; Mon, 2 Feb 2015 22:14:37 +1100 (AEDT) Received: from localhost ([::1]:53945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIExf-0007mU-Py for incoming@patchwork.ozlabs.org; Mon, 02 Feb 2015 06:14:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEx7-0006qz-2r for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIEx1-0004u7-DM for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:14:01 -0500 Received: from mga11.intel.com ([192.55.52.93]:26662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEx1-0004u3-8A for qemu-devel@nongnu.org; Mon, 02 Feb 2015 06:13:55 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 02 Feb 2015 03:13:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,505,1418112000"; d="scan'208";a="679624473" Received: from lil.sh.intel.com (HELO localhost) ([10.239.159.167]) by orsmga002.jf.intel.com with ESMTP; 02 Feb 2015 03:13:52 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Mon, 2 Feb 2015 19:05:40 +0800 Message-Id: <1422875149-13198-5-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422875149-13198-1-git-send-email-liang.z.li@intel.com> References: <1422875149-13198-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, dgilbert@redhat.com, Yang Zhang , amit.shah@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [v4 04/13] qemu-file: Add compression functions to QEMUFile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_put_compression_data() compress the data and put it to QEMUFile. qemu_put_qemu_file() put the data in the buffer of source QEMUFile to destination QEMUFile. Signed-off-by: Liang Li Signed-off-by: Yang Zhang --- include/migration/qemu-file.h | 3 +++ migration/qemu-file.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index d843c00..2204fb9 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -159,6 +159,9 @@ void qemu_put_be32(QEMUFile *f, unsigned int v); void qemu_put_be64(QEMUFile *f, uint64_t v); int qemu_peek_buffer(QEMUFile *f, uint8_t *buf, int size, size_t offset); int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size); +size_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, + int level); +int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src); /* * Note that you can only peek continuous bytes from where the current pointer * is; you aren't guaranteed to be able to peak to +n bytes unless you've diff --git a/migration/qemu-file.c b/migration/qemu-file.c index edc2830..de2da2d 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include #include "qemu-common.h" #include "qemu/iov.h" #include "qemu/sockets.h" @@ -529,3 +530,41 @@ uint64_t qemu_get_be64(QEMUFile *f) v |= qemu_get_be32(f); return v; } + +/* compress size bytes of data start at p with specific compression + * leve and store the compressed data to the buffer of f. + */ + +size_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, + int level) +{ + size_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int32_t); + + if (blen < compressBound(size)) { + return 0; + } + if (compress2(f->buf + f->buf_index + sizeof(int32_t), &blen, (Bytef *)p, + size, level) != Z_OK) { + error_report("Compress Failed!"); + return 0; + } + qemu_put_be32(f, blen); + f->buf_index += blen; + return blen + sizeof(int32_t); +} + +/* Put the data in the buffer of f_src to the buffer of f_des, and + * then reset the buf_index of f_src to 0. + */ + +int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src) +{ + int len = 0; + + if (f_src->buf_index > 0) { + len = f_src->buf_index; + qemu_put_buffer(f_des, f_src->buf, f_src->buf_index); + f_src->buf_index = 0; + } + return len; +}