From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lojk7-0004L9-G7
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 15:35:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lojk3-0004Gn-WF
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 15:35:27 -0400
Received: from [199.232.76.173] (port=42575 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lojk3-0004Gk-Ph
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 15:35:23 -0400
Received: from mx2.redhat.com ([66.187.237.31]:42167)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <ykamay@redhat.com>) id 1Lojk3-00035Y-AD
	for qemu-devel@nongnu.org; Tue, 31 Mar 2009 15:35:23 -0400
Message-ID: <49D27077.8000209@redhat.com>
Date: Tue, 31 Mar 2009 22:35:19 +0300
From: Yaniv Kamay <ykamay@redhat.com>
MIME-Version: 1.0
References: <1238521389-4130-1-git-send-email-glommer@redhat.com>
In-Reply-To: <1238521389-4130-1-git-send-email-glommer@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 3/3] propagate error on failed completion
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Glauber Costa <glommer@redhat.com>
Cc: aliguori@us.ibm.com, Dor Laor <dlaor@redhat.com>, qemu-devel@nongnu.org, avi@redhat.com

Glauber Costa wrote:
> migrate_fd_put_ready() calls qemu_savevm_state_complete(),
> but the later can fail.
>
> If it happens, re-start the vm and propagate the error up
>
> Based on a patch by Yaniv Kamay
>
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> CC: Yaniv Kamay <ykamay@redhat.com>
> CC: Dor Laor <dlaor@redhat.com>
> ---
>  migration.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/migration.c b/migration.c
> index b3904b2..d77ebbd 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -224,7 +224,11 @@ void migrate_fd_put_ready(void *opaque)
>          vm_stop(0);
>  
>          bdrv_flush_all();
> -        qemu_savevm_state_complete(s->file);
> +        if ((qemu_savevm_state_complete(s->file)) < 0) {
> +            vm_start();
> +            s->state = MIG_STATE_ERROR;
> +            return;
> +        }
>          s->state = MIG_STATE_COMPLETED;
>          migrate_fd_cleanup(s);
>      }
>   
We need to call migrate_fd_cleanup() in case of error.

Yaniv