From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bbZpt-0007Rc-G5 for qemu-devel@nongnu.org; Sun, 21 Aug 2016 16:59:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bbZpr-0005ya-KZ for qemu-devel@nongnu.org; Sun, 21 Aug 2016 16:59:16 -0400 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]:36859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bbZpr-0005yU-Ds for qemu-devel@nongnu.org; Sun, 21 Aug 2016 16:59:15 -0400 Received: by mail-pa0-x242.google.com with SMTP id ez1so6813266pab.3 for ; Sun, 21 Aug 2016 13:59:15 -0700 (PDT) From: Md Haris Iqbal Date: Mon, 22 Aug 2016 02:28:48 +0530 Message-Id: <1471813132-13836-3-git-send-email-haris.phnx@gmail.com> In-Reply-To: <1471813132-13836-1-git-send-email-haris.phnx@gmail.com> References: <1471813132-13836-1-git-send-email-haris.phnx@gmail.com> Subject: [Qemu-devel] [PATCH 2/6] migration : General additions for migration recovery List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, Md Haris Iqbal Signed-off-by: Md Haris Iqbal --- include/migration/qemu-file.h | 1 + migration/migration.c | 3 +++ migration/qemu-file.c | 5 +++++ 3 files changed, 9 insertions(+) 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; -- 2.7.4