From patchwork Wed Aug 15 07:41:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 177580 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 88CEC2C009F for ; Wed, 15 Aug 2012 19:02:34 +1000 (EST) Received: from localhost ([::1]:39007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YFZ-0006aI-Ma for incoming@patchwork.ozlabs.org; Wed, 15 Aug 2012 03:42:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YF5-0005Ts-3H for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:42:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1YF3-0008Uw-Vv for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:42:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1YF3-0008Ul-NL for qemu-devel@nongnu.org; Wed, 15 Aug 2012 03:42:13 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7F7gDbR021356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 15 Aug 2012 03:42:13 -0400 Received: from antique-laptop.brq.redhat.com (dhcp-27-198.brq.redhat.com [10.34.27.198]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7F7g0el009478; Wed, 15 Aug 2012 03:42:12 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Wed, 15 Aug 2012 09:41:50 +0200 Message-Id: <6d66be62f5e6e6039eefa1350366688885ee0c17.1345016001.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Pavel Hrdina Subject: [Qemu-devel] [PATCH 09/18] 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 --- migration.c | 2 +- savevm.c | 11 +++++++++-- sysemu.h | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index dde4dec..1e71374 100644 --- a/migration.c +++ b/migration.c @@ -321,7 +321,7 @@ static void migrate_fd_put_ready(void *opaque) } DPRINTF("iterate\n"); - ret = qemu_savevm_state_iterate(s->file); + ret = qemu_savevm_state_iterate(s->file, NULL); if (ret < 0) { migrate_fd_error(s); } else if (ret == 1) { diff --git a/savevm.c b/savevm.c index d212cb2..7d6db32 100644 --- a/savevm.c +++ b/savevm.c @@ -1617,7 +1617,8 @@ 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; @@ -1651,10 +1652,16 @@ int qemu_savevm_state_iterate(QEMUFile *f) } } if (ret != 0) { + if (ret < 0) { + error_set(errp, QERR_GENERIC_ERROR, ret); + } return ret; } ret = qemu_file_get_error(f); if (ret != 0) { + if (ret < 0) { + error_set(errp, QERR_GENERIC_ERROR, ret); + } qemu_savevm_state_cancel(f); } return ret; @@ -1745,7 +1752,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); diff --git a/sysemu.h b/sysemu.h index bc65c64..405ce98 100644 --- a/sysemu.h +++ b/sysemu.h @@ -80,7 +80,8 @@ 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); int qemu_loadvm_state(QEMUFile *f);