From patchwork Fri Mar 22 13:16:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 230013 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 C8D992C00AC for ; Sat, 23 Mar 2013 00:18:45 +1100 (EST) Received: from localhost ([::1]:37101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1rn-00088s-UW for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 09:18:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pg-00056D-99 for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ1pb-00089D-HW for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pb-00088x-7z for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:27 -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 r2MDGQT2001323 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Mar 2013 09:16:26 -0400 Received: from localhost.localdomain.com (vpn1-5-126.ams2.redhat.com [10.36.5.126]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2MDGBBh008641; Fri, 22 Mar 2013 09:16:25 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 14:16:05 +0100 Message-Id: <779bf348805cf382293125afb5051f01d9a940e5.1363957855.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Pavel Hrdina , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 06/12] savevm: add error parameter to qemu_savevm_state() 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 Reviewed-by: Eric Blake --- savevm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/savevm.c b/savevm.c index 76af390..71981d1 100644 --- a/savevm.c +++ b/savevm.c @@ -1796,7 +1796,7 @@ void qemu_savevm_state_cancel(void) } } -static int qemu_savevm_state(QEMUFile *f) +static int qemu_savevm_state(QEMUFile *f, Error **errp) { int ret; MigrationParams params = { @@ -1804,23 +1804,23 @@ static int qemu_savevm_state(QEMUFile *f) .shared = 0 }; - if (qemu_savevm_state_blocked(NULL)) { + if (qemu_savevm_state_blocked(errp)) { return -EINVAL; } qemu_mutex_unlock_iothread(); - qemu_savevm_state_begin(f, ¶ms, NULL); + qemu_savevm_state_begin(f, ¶ms, errp); qemu_mutex_lock_iothread(); while (qemu_file_get_error(f) == 0) { - if (qemu_savevm_state_iterate(f, NULL) > 0) { + if (qemu_savevm_state_iterate(f, errp) > 0) { break; } } ret = qemu_file_get_error(f); if (ret == 0) { - qemu_savevm_state_complete(f, NULL); + qemu_savevm_state_complete(f, errp); ret = qemu_file_get_error(f); } if (ret != 0) { @@ -2207,7 +2207,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) monitor_printf(mon, "Could not open VM state file\n"); goto the_end; } - ret = qemu_savevm_state(f); + ret = qemu_savevm_state(f, NULL); vm_state_size = qemu_ftell(f); qemu_fclose(f); if (ret < 0) {