From d1e45898016eb902411abe5c5b377a490e2b03b2 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Fri, 22 Feb 2013 17:36:31 +0100

Subject: [PATCH] qemu-file: make qemu_fflush and qemu_file_set_error private

 again

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>

(cherry picked from commit 05f28b837c6bd6124abab2496ce15c07a334a5ad)

---

 include/migration/qemu-file.h | 2 --

 savevm.c                      | 4 ++--

 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h

index 5e0c287..46fc11d 100644

--- a/include/migration/qemu-file.h

+++ b/include/migration/qemu-file.h

@@ -82,7 +82,6 @@ QEMUFile *qemu_popen_cmd(const char *command, const char *mode);

 int qemu_get_fd(QEMUFile *f);

 int qemu_fclose(QEMUFile *f);

 int64_t qemu_ftell(QEMUFile *f);

-void qemu_fflush(QEMUFile *f);

 void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);

 void qemu_put_byte(QEMUFile *f, int v);

@@ -114,7 +113,6 @@ int qemu_file_rate_limit(QEMUFile *f);

 int64_t 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);

 static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv)

 {

diff --git a/savevm.c b/savevm.c

index ce10295..fef2ab9 100644

--- a/savevm.c

+++ b/savevm.c

@@ -443,7 +443,7 @@ int qemu_file_get_error(QEMUFile *f)

     return f->last_error;

 }

-void qemu_file_set_error(QEMUFile *f, int ret)

+static void qemu_file_set_error(QEMUFile *f, int ret)

 {

     if (f->last_error == 0) {

         f->last_error = ret;

@@ -453,7 +453,7 @@ void qemu_file_set_error(QEMUFile *f, int ret)

 /** Flushes QEMUFile buffer

  *

  */

-void qemu_fflush(QEMUFile *f)

+static void qemu_fflush(QEMUFile *f)

 {

     int ret = 0;