From patchwork Wed Jan 9 15:17:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 210724 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 326EF2C0147 for ; Thu, 10 Jan 2013 02:18:43 +1100 (EST) Received: from localhost ([::1]:36221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQP-000624-59 for incoming@patchwork.ozlabs.org; Wed, 09 Jan 2013 10:18:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQ2-0005fx-63 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 1TsxQ0-0005Ce-Hv for qemu-devel@nongnu.org; Wed, 09 Jan 2013 10:18:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsxQ0-0005CO-A2 for qemu-devel@nongnu.org; Wed, 09 Jan 2013 10:18:16 -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 r09FIFOa032599 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Jan 2013 10:18:15 -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 r09FI9ch021430; Wed, 9 Jan 2013 10:18:14 -0500 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2013 16:17:57 +0100 Message-Id: <8c061da39c66e080c8c4bd317b36b6ecd0a42a11.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 03/13] savevm: add error parameter to qemu_savevm_state_begin() 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 | 3 ++- migration.c | 2 +- savevm.c | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 28a783e..e50f990 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); int qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params); + const MigrationParams *params, + Error **errp); int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f); void qemu_savevm_state_cancel(QEMUFile *f); diff --git a/migration.c b/migration.c index c69e864..cb38867 100644 --- a/migration.c +++ b/migration.c @@ -678,7 +678,7 @@ static bool migrate_fd_put_ready(MigrationState *s, uint64_t max_size) if (s->first_time) { s->first_time = false; DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->file, &s->params); + ret = qemu_savevm_state_begin(s->file, &s->params, NULL); if (ret < 0) { DPRINTF("failed, %d\n", ret); migrate_fd_error(s); diff --git a/savevm.c b/savevm.c index fae0cba..e2ecb0b 100644 --- a/savevm.c +++ b/savevm.c @@ -1557,7 +1557,8 @@ bool qemu_savevm_state_blocked(Error **errp) } int qemu_savevm_state_begin(QEMUFile *f, - const MigrationParams *params) + const MigrationParams *params, + Error **errp) { SaveStateEntry *se; int ret; @@ -1598,11 +1599,13 @@ int qemu_savevm_state_begin(QEMUFile *f, ret = se->ops->save_live_setup(f, se->opaque); if (ret < 0) { qemu_savevm_state_cancel(f); + error_setg(errp, "Failed to begin vmstate save."); return ret; } } ret = qemu_file_get_error(f); if (ret != 0) { + error_setg_errno(errp, errno, "Failed to begin vmstate save."); qemu_savevm_state_cancel(f); } @@ -1758,7 +1761,7 @@ static int qemu_savevm_state(QEMUFile *f) goto out; } - ret = qemu_savevm_state_begin(f, ¶ms); + ret = qemu_savevm_state_begin(f, ¶ms, NULL); if (ret < 0) goto out;