From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2lVM-0001OV-UB for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2lVG-0006Vz-M9 for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2lVG-0006VY-Bf for qemu-devel@nongnu.org; Mon, 13 Jan 2014 12:40:46 -0500 From: Juan Quintela Date: Mon, 13 Jan 2014 18:39:49 +0100 Message-Id: <1389634834-24181-5-git-send-email-quintela@redhat.com> In-Reply-To: <1389634834-24181-1-git-send-email-quintela@redhat.com> References: <1389634834-24181-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 04/49] qemu-file: Make a few functions non-static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , anthony@codemonkey.ws From: Eduardo Habkost The QEMUFile code will be moved to qemu-file.c. This will require making the following functions non-static because they are used by the savevm.c code: * qemu_peek_byte() * qemu_peek_buffer() * qemu_file_skip() * qemu_file_set_error() Signed-off-by: Eduardo Habkost Reviewed-by: Orit Wasserman Signed-off-by: Juan Quintela --- include/migration/qemu-file.h | 4 ++++ savevm.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 0f757fb..a191fb6 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -121,8 +121,11 @@ static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) void qemu_put_be16(QEMUFile *f, unsigned int v); 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); +int qemu_peek_byte(QEMUFile *f, int offset); int qemu_get_byte(QEMUFile *f); +void qemu_file_skip(QEMUFile *f, int size); void qemu_update_position(QEMUFile *f, size_t size); static inline unsigned int qemu_get_ubyte(QEMUFile *f) @@ -141,6 +144,7 @@ void qemu_file_reset_rate_limit(QEMUFile *f); void qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate); int64_t qemu_file_get_rate_limit(QEMUFile *f); int qemu_file_get_error(QEMUFile *f); +void qemu_file_set_error(QEMUFile *f, int ret); void qemu_fflush(QEMUFile *f); static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv) diff --git a/savevm.c b/savevm.c index 3f912dd..8da1d29 100644 --- a/savevm.c +++ b/savevm.c @@ -578,7 +578,7 @@ int qemu_file_get_error(QEMUFile *f) return f->last_error; } -static void qemu_file_set_error(QEMUFile *f, int ret) +void qemu_file_set_error(QEMUFile *f, int ret) { if (f->last_error == 0) { f->last_error = ret; @@ -827,14 +827,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; @@ -880,7 +880,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; -- 1.8.4.2