From patchwork Wed Jan 9 15:17:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 210725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0AFB42C00FB for ; Thu, 10 Jan 2013 02:18:47 +1100 (EST) Received: from localhost ([::1]:36383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQT-00067V-24 for incoming@patchwork.ozlabs.org; Wed, 09 Jan 2013 10:18:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQ3-0005k4-Of for qemu-devel@nongnu.org; Wed, 09 Jan 2013 10:18:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsxQ2-0005Cy-3F for qemu-devel@nongnu.org; Wed, 09 Jan 2013 10:18:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQ1-0005Cm-Qz for qemu-devel@nongnu.org; Wed, 09 Jan 2013 10:18:18 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r09FIHd7016487 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Jan 2013 10:18:17 -0500 Received: from localhost.localdomain.com (dhcp-27-154.brq.redhat.com [10.34.27.154]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r09FI9ci021430; Wed, 9 Jan 2013 10:18:16 -0500 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2013 16:17:58 +0100 Message-Id: <83f1955a29f8a6219c96527154651ce065087759.1357741229.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Pavel Hrdina , phrdina@redhat.c0m, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 04/13] savevm: add error parameter to qemu_savevm_state_iterate() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Pavel Hrdina --- include/sysemu/sysemu.h | 2 +- migration.c | 2 +- savevm.c | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index e50f990..afc1fe6 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -76,7 +76,7 @@ bool qemu_savevm_state_blocked(Error **errp); int 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); int qemu_savevm_state_complete(QEMUFile *f); void qemu_savevm_state_cancel(QEMUFile *f); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); diff --git a/migration.c b/migration.c index cb38867..0f2d0fd 100644 --- a/migration.c +++ b/migration.c @@ -691,7 +691,7 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) pending_size = qemu_savevm_state_pending(s->file, max_size); DPRINTF("pending size %lu max %lu\n", pending_size, max_size); if (pending_size >= max_size) { - ret = qemu_savevm_state_iterate(s->file); + ret = qemu_savevm_state_iterate(s->file, NULL); if (ret < 0) { migrate_fd_error(s); } diff --git a/savevm.c b/savevm.c index e2ecb0b..4da2136 100644 --- a/savevm.c +++ b/savevm.c @@ -1619,7 +1619,7 @@ int 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; @@ -1652,13 +1652,18 @@ int qemu_savevm_state_iterate(QEMUFile *f) break; } } - if (ret != 0) { - return ret; + + if (ret == 0) { + ret = qemu_file_get_error(f); + if (ret != 0) { + qemu_savevm_state_cancel(f); + } } - ret = qemu_file_get_error(f); - if (ret != 0) { - qemu_savevm_state_cancel(f); + + if (ret < 0) { + error_setg_errno(errp, errno, "Failed to iterate vmstate save."); } + return ret; } @@ -1766,7 +1771,7 @@ static int qemu_savevm_state(QEMUFile *f) goto out; do { - ret = qemu_savevm_state_iterate(f); + ret = qemu_savevm_state_iterate(f, NULL); if (ret < 0) goto out; } while (ret == 0);