From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LohPP-0002RI-E8 for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:05:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LohPK-0002Nx-KU for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:05:54 -0400 Received: from [199.232.76.173] (port=57262 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LohPK-0002Nm-7v for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:05:50 -0400 Received: from miranda.se.axis.com ([193.13.178.8]:42681) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LohPJ-0004px-FI for qemu-devel@nongnu.org; Tue, 31 Mar 2009 13:05:49 -0400 Received: from axis.com (edgar.se.axis.com [10.93.151.1]) by miranda.se.axis.com (8.13.4/8.13.4/Debian-3sarge3) with ESMTP id n2VH5joO026139 for ; Tue, 31 Mar 2009 19:05:45 +0200 Date: Tue, 31 Mar 2009 19:05:45 +0200 From: "Edgar E. Iglesias" Subject: Re: [Qemu-devel] [PATCH 3/3] propagate error on failed completion Message-ID: <20090331170545.GA20554@edgar.se.axis.com> References: <1238518275-2980-1-git-send-email-glommer@redhat.com> <1238518275-2980-2-git-send-email-glommer@redhat.com> <1238518275-2980-3-git-send-email-glommer@redhat.com> <1238518275-2980-4-git-send-email-glommer@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1238518275-2980-4-git-send-email-glommer@redhat.com> 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, glommer@redhat.com Cc: Yaniv Kamay , aliguori@us.ibm.com, Dor Laor , avi@redhat.com On Tue, Mar 31, 2009 at 12:51:15PM -0400, 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 > 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..4574830 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); ^^^ Forgot something? > + vm_start(); > + s->done(s, MIG_STATE_ERROR); > + return; > + } > s->state = MIG_STATE_COMPLETED; > migrate_fd_cleanup(s); > } Cheers