Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lohzj-0000OX-Bp for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:43:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lohze-0000N2-Kw for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:43:26 -0400 Received: from [199.232.76.173] (port=39698 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lohze-0000Mz-Ee for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:43:22 -0400 Received: from mx20.gnu.org ([199.232.41.8]:33715) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lohzd-0001dw-8z for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:43:22 -0400 Received: from mx2.redhat.com ([66.187.237.31]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LohzY-0007ug-Nq for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:43:17 -0400 From: Glauber Costa Date: Tue, 31 Mar 2009 13:43:09 -0400 Message-Id: <1238521389-4130-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] propagate error on failed completion Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Yaniv Kamay , aliguori@us.ibm.com, Dor Laor , avi@redhat.com 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 CC: Yaniv Kamay CC: Dor Laor --- 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); } -- 1.5.6.6