diff mbox

[2/6] migration : General additions for migration recovery

Message ID 1471813132-13836-3-git-send-email-haris.phnx@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Md Haris Iqbal Aug. 21, 2016, 8:58 p.m. UTC 
Signed-off-by: Md Haris Iqbal <haris.phnx@gmail.com>
---
 include/migration/qemu-file.h | 1 +
 migration/migration.c         | 3 +++
 migration/qemu-file.c         | 5 +++++
 3 files changed, 9 insertions(+)
diff mbox

Patch

diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index abedd46..56a51b9 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -181,6 +181,7 @@  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_file_clear_error(QEMUFile *f);
 int qemu_file_shutdown(QEMUFile *f);
 QEMUFile *qemu_file_get_return_path(QEMUFile *f);
 void qemu_fflush(QEMUFile *f);
diff --git a/migration/migration.c b/migration/migration.c
index 6ed2e82..149cf1e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -63,6 +63,9 @@  static NotifierList migration_state_notifiers =
 
 static bool deferred_incoming;
 
+static QemuMutex migration_recovery_mutex;
+static QemuCond migration_recovery_cond;
+
 /*
  * Current state of incoming postcopy; note this is not part of
  * MigrationIncomingState since it's state is used during cleanup
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index e9fae31..60e53c9 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -127,6 +127,11 @@  void qemu_file_set_error(QEMUFile *f, int ret)
     }
 }
 
+void qemu_file_clear_error(QEMUFile *f)
+{
+    f->last_error = 0;
+}
+
 bool qemu_file_is_writable(QEMUFile *f)
 {
     return f->ops->writev_buffer;