From: Liang Li <liang.z.li@intel.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, Liang Li <liang.z.li@intel.com>,
armbru@redhat.com, lcapitulino@redhat.com,
yang.z.zhang@intel.com, dgilbert@redhat.com
Subject: [Qemu-devel] [v3 04/13] qemu-file: Add tow function will be used in migration
Date: Fri, 12 Dec 2014 09:28:57 +0800 [thread overview]
Message-ID: <1418347746-15829-5-git-send-email-liang.z.li@intel.com> (raw)
In-Reply-To: <1418347746-15829-1-git-send-email-liang.z.li@intel.com>
migrate_qemu_add_compression_data() compress the data
and put it to QEMUFile. migrate_qemu_flush() put the
data in the source QEMUFile to destination QEMUFile.
The two function can help to do live migration.
Signed-off-by: Liang Li <liang.z.li@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
---
include/migration/qemu-file.h | 3 +++
qemu-file.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index 401676b..d70fb8d 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -150,6 +150,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 migrate_qemu_add_compression_data(QEMUFile *f,
+ const uint8_t *p, size_t size, int level);
+int migrate_qemu_flush(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/qemu-file.c b/qemu-file.c
index f938e36..2668ad0 100644
--- a/qemu-file.c
+++ b/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 <zlib.h>
#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
@@ -993,3 +994,34 @@ QEMUFile *qemu_bufopen(const char *mode, QEMUSizedBuffer *input)
}
return s->file;
}
+
+/* compress size bytes of data start at p with specific compression
+ * leve and store the compressed data to the buffer of f.
+ */
+
+size_t migrate_qemu_add_compression_data(QEMUFile *f,
+ const uint8_t *p, size_t size, int level)
+{
+ size_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int);
+
+ if (compress2(f->buf + f->buf_index + sizeof(int), &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(int);
+}
+
+int migrate_qemu_flush(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;
+}
--
1.8.3.1
next prev parent reply other threads:[~2014-12-12 1:36 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 1:28 [Qemu-devel] [PATCH v3 0/13] migration: Add a new feature to do live migration Liang Li
2014-12-12 1:28 ` [Qemu-devel] [v3 01/13] docs: Add a doc about multiple thread compression Liang Li
2015-01-23 13:17 ` Dr. David Alan Gilbert
2015-01-23 15:24 ` Eric Blake
2014-12-12 1:28 ` [Qemu-devel] [v3 02/13] migration: Add the framework of multi-thread compression Liang Li
2015-01-23 13:23 ` Dr. David Alan Gilbert
2015-01-23 16:09 ` Eric Blake
2014-12-12 1:28 ` [Qemu-devel] [v3 03/13] migration: Add the framework of muti-thread decompression Liang Li
2015-01-23 13:26 ` Dr. David Alan Gilbert
2015-01-23 16:22 ` Eric Blake
2014-12-12 1:28 ` Liang Li [this message]
2015-01-23 13:31 ` [Qemu-devel] [v3 04/13] qemu-file: Add tow function will be used in migration Dr. David Alan Gilbert
2015-01-24 13:42 ` Li, Liang Z
2014-12-12 1:28 ` [Qemu-devel] [v3 05/13] arch_init: alloc and free data struct in multi-thread compression Liang Li
2015-01-23 13:35 ` Dr. David Alan Gilbert
2015-01-24 13:46 ` Li, Liang Z
2014-12-12 1:28 ` [Qemu-devel] [v3 06/13] arch_init: Add data struct used by decompression Liang Li
2014-12-12 1:29 ` [Qemu-devel] [v3 07/13] migraion: Rewrite the function ram_save_page() Liang Li
2015-01-23 13:38 ` Dr. David Alan Gilbert
2014-12-12 1:29 ` [Qemu-devel] [v3 08/13] migration: Add the core code of multi-thread compresion Liang Li
2015-01-23 13:39 ` Dr. David Alan Gilbert
2015-01-24 13:51 ` Li, Liang Z
2014-12-12 1:29 ` [Qemu-devel] [v3 09/13] migration: Make compression co-work with xbzrle Liang Li
2015-01-23 13:40 ` Dr. David Alan Gilbert
2014-12-12 1:29 ` [Qemu-devel] [v3 10/13] migration: Add the core code of multi-thread decompression Liang Li
2015-01-23 13:42 ` Dr. David Alan Gilbert
2014-12-12 1:29 ` [Qemu-devel] [v3 11/13] migration: Add interface to control compression Liang Li
2015-01-23 13:44 ` Dr. David Alan Gilbert
2015-01-23 15:26 ` Eric Blake
2014-12-12 1:29 ` [Qemu-devel] [v3 12/13] migration: Add command to set migration parameter Liang Li
2015-01-23 13:48 ` Dr. David Alan Gilbert
2015-01-23 15:42 ` Eric Blake
2015-01-23 15:59 ` Dr. David Alan Gilbert
2015-01-23 16:06 ` Eric Blake
2015-01-24 14:14 ` Li, Liang Z
2015-01-26 9:22 ` Dr. David Alan Gilbert
2015-01-23 15:39 ` Eric Blake
2014-12-12 1:29 ` [Qemu-devel] [v3 13/13] migration: Add command to query " Liang Li
2015-01-23 13:49 ` Dr. David Alan Gilbert
2015-01-23 15:47 ` Eric Blake
2014-12-24 5:08 ` [Qemu-devel] [PATCH v3 0/13] migration: Add a new feature to do live migration Li, Liang Z
2015-01-07 3:12 ` Li, Liang Z
2015-01-23 13:10 ` Dr. David Alan Gilbert
2015-01-24 13:25 ` Li, Liang Z
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=1418347746-15829-5-git-send-email-liang.z.li@intel.com \
--to=liang.z.li@intel.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=yang.z.zhang@intel.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).