From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LqY3N-0004Kj-QV
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:30:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LqY3M-0004JN-Ht
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:30:48 -0400
Received: from [199.232.76.173] (port=46941 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LqY3M-0004JB-CB
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:30:48 -0400
Received: from savannah.gnu.org ([199.232.41.3]:40658 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1LqY3M-0008Q3-35
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 15:30:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LqY3L-0000mG-9w
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 19:30:47 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LqY38-0000lb-Cp
	for qemu-devel@nongnu.org; Sun, 05 Apr 2009 19:30:37 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LqY38-0000lb-Cp@cvs.savannah.gnu.org>
Date: Sun, 05 Apr 2009 19:30:34 +0000
Subject: [Qemu-devel] [6997] propagate error on failed completion (Glauber
	Costa)
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: qemu-devel@nongnu.org

Revision: 6997
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6997
Author:   aliguori
Date:     2009-04-05 19:30:33 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
propagate error on failed completion (Glauber Costa)

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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/migration.c

Modified: trunk/migration.c
===================================================================
--- trunk/migration.c	2009-04-05 19:29:26 UTC (rev 6996)
+++ trunk/migration.c	2009-04-05 19:30:33 UTC (rev 6997)
@@ -220,13 +220,19 @@
 
     dprintf("iterate\n");
     if (qemu_savevm_state_iterate(s->file) == 1) {
+        int state;
         dprintf("done iterating\n");
         vm_stop(0);
 
         bdrv_flush_all();
-        qemu_savevm_state_complete(s->file);
-        s->state = MIG_STATE_COMPLETED;
+        if ((qemu_savevm_state_complete(s->file)) < 0) {
+            vm_start();
+            state = MIG_STATE_ERROR;
+        } else {
+            state = MIG_STATE_COMPLETED;
+        }
         migrate_fd_cleanup(s);
+        s->state = state;
     }
 }