From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFz8-0006rY-6I for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:47:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULFz5-0004IL-7k for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:47:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFz4-0004IF-V8 for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:47:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2SGlQuV017168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Mar 2013 12:47:26 -0400 From: Pavel Hrdina Date: Thu, 28 Mar 2013 17:47:07 +0100 Message-Id: <740cf8fe71106515342fd644660b37665cd55d13.1364487348.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v3 03/11] savevm: add error parameter to qemu_savevm_state_begin() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Signed-off-by: Pavel Hrdina Reviewed-by: Eric Blake --- include/sysemu/sysemu.h | 3 ++- migration.c | 2 +- savevm.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6578782..2f35a05 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -74,7 +74,8 @@ void qemu_announce_self(void); bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params); + const MigrationParams *params, + Error **errp); int qemu_savevm_state_iterate(QEMUFile *f); void qemu_savevm_state_complete(QEMUFile *f); void qemu_savevm_state_cancel(void); diff --git a/migration.c b/migration.c index 7fb2147..d517dd6 100644 --- a/migration.c +++ b/migration.c @@ -505,7 +505,7 @@ static void *migration_thread(void *opaque) bool old_vm_running = false; DPRINTF("beginning savevm\n"); - qemu_savevm_state_begin(s->file, &s->params); + qemu_savevm_state_begin(s->file, &s->params, NULL); while (s->state == MIG_STATE_ACTIVE) { int64_t current_time; diff --git a/savevm.c b/savevm.c index dc1f4a4..56da096 100644 --- a/savevm.c +++ b/savevm.c @@ -1731,7 +1731,8 @@ bool qemu_savevm_state_blocked(Error **errp) } void qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params) + const MigrationParams *params, + Error **errp) { SaveStateEntry *se; int ret; @@ -1921,7 +1922,7 @@ static int qemu_savevm_state(QEMUFile *f) } qemu_mutex_unlock_iothread(); - qemu_savevm_state_begin(f, ¶ms); + qemu_savevm_state_begin(f, ¶ms, NULL); qemu_mutex_lock_iothread(); while (qemu_file_get_error(f) == 0) { -- 1.8.1.4