From patchwork Tue Oct 30 08:32:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3, 07/35] savevm: export qemu_peek_buffer, qemu_peek_byte, qemu_file_skip, qemu_fflush Date: Mon, 29 Oct 2012 22:32:43 -0000 From: Isaku Yamahata X-Patchwork-Id: 195358 Message-Id: To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: benoit.hudzia@gmail.com, aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, t.hirofuchi@aist.go.jp, dlaor@redhat.com, satoshi.itoh@aist.go.jp, mdroth@linux.vnet.ibm.com, yoshikawa.takuya@oss.ntt.co.jp, owasserm@redhat.com, avi@redhat.com, pbonzini@redhat.com, chegu_vinod@hp.com Those will be used by postcopy. Signed-off-by: Isaku Yamahata --- qemu-file.h | 4 ++++ savevm.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qemu-file.h b/qemu-file.h index 9c8985b..9b6dd08 100644 --- a/qemu-file.h +++ b/qemu-file.h @@ -72,6 +72,7 @@ QEMUFile *qemu_popen(FILE *popen_file, const char *mode); QEMUFile *qemu_popen_cmd(const char *command, const char *mode); int qemu_stdio_fd(QEMUFile *f); int qemu_fclose(QEMUFile *f); +int qemu_fflush(QEMUFile *f); void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size); void qemu_put_byte(QEMUFile *f, int v); @@ -87,6 +88,9 @@ void qemu_put_be32(QEMUFile *f, unsigned int v); void qemu_put_be64(QEMUFile *f, uint64_t v); int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size); int qemu_get_byte(QEMUFile *f); +int qemu_peek_byte(QEMUFile *f, int offset); +int qemu_peek_buffer(QEMUFile *f, uint8_t *buf, int size, size_t offset); +void qemu_file_skip(QEMUFile *f, int size); static inline unsigned int qemu_get_ubyte(QEMUFile *f) { diff --git a/savevm.c b/savevm.c index b080d37..0c7af43 100644 --- a/savevm.c +++ b/savevm.c @@ -448,7 +448,7 @@ static void qemu_file_set_error(QEMUFile *f, int ret) /** Flushes QEMUFile buffer * */ -static int qemu_fflush(QEMUFile *f) +int qemu_fflush(QEMUFile *f) { int ret = 0; @@ -583,14 +583,14 @@ void qemu_put_byte(QEMUFile *f, int v) } } -static void qemu_file_skip(QEMUFile *f, int size) +void qemu_file_skip(QEMUFile *f, int size) { if (f->buf_index + size <= f->buf_size) { f->buf_index += size; } } -static int qemu_peek_buffer(QEMUFile *f, uint8_t *buf, int size, size_t offset) +int qemu_peek_buffer(QEMUFile *f, uint8_t *buf, int size, size_t offset) { int pending; int index; @@ -638,7 +638,7 @@ int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size) return done; } -static int qemu_peek_byte(QEMUFile *f, int offset) +int qemu_peek_byte(QEMUFile *f, int offset) { int index = f->buf_index + offset;