From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42218 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OXIG9-00057d-OZ
	for qemu-devel@nongnu.org; Fri, 09 Jul 2010 14:25:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1OXIG7-0008Nm-Rn
	for qemu-devel@nongnu.org; Fri, 09 Jul 2010 14:25:13 -0400
Received: from mx1.redhat.com ([209.132.183.28]:1285)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1OXIG7-0008N8-IG
	for qemu-devel@nongnu.org; Fri, 09 Jul 2010 14:25:11 -0400
Date: Fri, 9 Jul 2010 15:18:51 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20100709181851.GB7444@amt.cnet>
References: <20100707180411.GA17569@amt.cnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100707180411.GA17569@amt.cnet>
Subject: [Qemu-devel] [PATCH] set proper migration status on ->write error
	(v3)
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.nongnu.org/archive/html/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: Anthony Liguori <anthony@codemonkey.ws>, Juan Quintela <quintela@redhat.com>, Luiz Capitulino <lcapitulino@redhat.com>
Cc: qemu-devel@nongnu.org


If ->write fails, declare migration status as MIG_STATE_ERROR. 

Also, in buffered_file.c, ->close the object in case of an 
error.

Fixes "migrate -d "exec:dd of=file", where dd fails to open file.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/buffered_file.c b/buffered_file.c
index 54dc6c2..be147d6 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -222,8 +222,10 @@ static void buffered_rate_tick(void *opaque)
 {
     QEMUFileBuffered *s = opaque;
 
-    if (s->has_error)
+    if (s->has_error) {
+        buffered_close(s);
         return;
+    }
 
     qemu_mod_timer(s->timer, qemu_get_clock(rt_clock) + 100);
 
diff --git a/migration.c b/migration.c
index b49964c..862dc4f 100644
--- a/migration.c
+++ b/migration.c
@@ -316,8 +316,12 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
     if (ret == -1)
         ret = -(s->get_error(s));
 
-    if (ret == -EAGAIN)
+    if (ret == -EAGAIN) {
         qemu_set_fd_handler2(s->fd, NULL, NULL, migrate_fd_put_notify, s);
+    } else if (ret < 0) {
+        monitor_resume(s);
+        s->state = MIG_STATE_ERROR;
+    }
 
     return ret;
 }