[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/49] qemu-file: Make a few functions non-static
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 04/49] qemu-file: Make a few functions non-static |
Date: |
Mon, 13 Jan 2014 18:39:49 +0100 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Reviewed-by: Orit Wasserman <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
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
- [Qemu-devel] [PULL 00/49] migration queue, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 01/49] avoid a bogus COMPLETED->CANCELLED transition, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 02/49] introduce MIG_STATE_CANCELLING state, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 03/49] migration: Fix rate limit, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 05/49] migration: Move QEMU_VM_* defines to migration/migration.h, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 04/49] qemu-file: Make a few functions non-static,
Juan Quintela <=
- [Qemu-devel] [PATCH 06/49] savevm: Convert all tabs to spaces, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 08/49] savevm.c: Coding style fix, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 07/49] savevm.c: Coding style fixes, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 11/49] savevm: Small comment about why timer QEMUFile/VMState code is in savevm.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 12/49] tests: Some unit tests for vmstate.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 10/49] qemu-file: Move QEMUFile code to qemu-file.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 09/49] vmstate: Move VMState code to vmstate.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 13/49] bitmap: use long as index, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 14/49] memory: cpu_physical_memory_set_dirty_flags() result is never used, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 15/49] memory: cpu_physical_memory_set_dirty_range() return void, Juan Quintela, 2014/01/13