From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pc-0004z9-AK for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ1pX-00087L-MJ for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pX-00086w-Dc for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:23 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MDGMop016685 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Mar 2013 09:16:23 -0400 From: Pavel Hrdina Date: Fri, 22 Mar 2013 14:16:03 +0100 Message-Id: <2807cb1036d5412c76b83d70aebfbbb27e24001d.1363957855.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 04/12] savevm: add error parameter to qemu_savevm_state_iterate() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pavel Hrdina , armbru@redhat.com, lcapitulino@redhat.com Signed-off-by: Pavel Hrdina --- include/sysemu/sysemu.h | 2 +- migration.c | 2 +- savevm.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 2f35a05..af4f699 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -76,7 +76,7 @@ bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params, Error **errp); -int qemu_savevm_state_iterate(QEMUFile *f); +int qemu_savevm_state_iterate(QEMUFile *f, Error **errp); void qemu_savevm_state_complete(QEMUFile *f); void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); diff --git a/migration.c b/migration.c index 66cba46..c2bf531 100644 --- a/migration.c +++ b/migration.c @@ -515,7 +515,7 @@ static void *migration_thread(void *opaque) pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); if (pending_size && pending_size >= max_size) { - qemu_savevm_state_iterate(s->file); + qemu_savevm_state_iterate(s->file, NULL); } else { DPRINTF("done iterating\n"); qemu_mutex_lock_iothread(); diff --git a/savevm.c b/savevm.c index 018e070..c5ac701 100644 --- a/savevm.c +++ b/savevm.c @@ -1670,7 +1670,7 @@ void qemu_savevm_state_begin(QEMUFile *f, * 0 : We haven't finished, caller have to go again * 1 : We have finished, we can go to complete phase */ -int qemu_savevm_state_iterate(QEMUFile *f) +int qemu_savevm_state_iterate(QEMUFile *f, Error **errp) { SaveStateEntry *se; int ret = 1; @@ -1811,9 +1811,8 @@ static int qemu_savevm_state(QEMUFile *f) qemu_savevm_state_begin(f, ¶ms, NULL); qemu_mutex_lock_iothread(); - while (qemu_file_get_error(f) == 0) { - if (qemu_savevm_state_iterate(f) > 0) { + if (qemu_savevm_state_iterate(f, NULL) > 0) { break; } } -- 1.8.1.4