From patchwork Fri Mar 29 14:12:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 232426 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 00C852C00CA for ; Sat, 30 Mar 2013 01:15:10 +1100 (EST) Received: from localhost ([::1]:54331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa5E-0005LP-3C for incoming@patchwork.ozlabs.org; Fri, 29 Mar 2013 10:15:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa33-0002HL-H7 for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULa31-0003ZO-TD for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa31-0003ZI-Jx for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:51 -0400 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 r2TECpKc014211 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 10:12:51 -0400 Received: from localhost.localdomain.com (vpn1-6-110.ams2.redhat.com [10.36.6.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2TECc3V031878; Fri, 29 Mar 2013 10:12:49 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2013 15:12:32 +0100 Message-Id: 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: phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v4 05/11] savevm: add error parameter to qemu_savevm_state_complete() 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 --- include/sysemu/sysemu.h | 2 +- migration.c | 2 +- savevm.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index af4f699..9e6a4a9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,7 +77,7 @@ void qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params, Error **errp); int qemu_savevm_state_iterate(QEMUFile *f, Error **errp); -void qemu_savevm_state_complete(QEMUFile *f); +void qemu_savevm_state_complete(QEMUFile *f, Error **errp); void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); diff --git a/migration.c b/migration.c index e9d2f40..c891a45 100644 --- a/migration.c +++ b/migration.c @@ -525,7 +525,7 @@ static void *migration_thread(void *opaque) old_vm_running = runstate_is_running(); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); qemu_file_set_rate_limit(s->file, INT_MAX); - qemu_savevm_state_complete(s->file); + qemu_savevm_state_complete(s->file, NULL); qemu_mutex_unlock_iothread(); if (!qemu_file_get_error(s->file)) { migrate_finish_set_state(s, MIG_STATE_COMPLETED); diff --git a/savevm.c b/savevm.c index 575f1b2..7598934 100644 --- a/savevm.c +++ b/savevm.c @@ -1823,7 +1823,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, Error **errp) return ret; } -void qemu_savevm_state_complete(QEMUFile *f) +void qemu_savevm_state_complete(QEMUFile *f, Error **errp) { SaveStateEntry *se; int ret; @@ -1848,6 +1848,7 @@ void qemu_savevm_state_complete(QEMUFile *f) trace_savevm_section_end(se->section_id); if (ret < 0) { qemu_file_set_error(f, ret); + error_setg(errp, "failed to complete vmstate save"); return; } } @@ -1933,7 +1934,7 @@ static int qemu_savevm_state(QEMUFile *f) ret = qemu_file_get_error(f); if (ret == 0) { - qemu_savevm_state_complete(f); + qemu_savevm_state_complete(f, NULL); ret = qemu_file_get_error(f); } if (ret != 0) {