From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40003 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om51J-0007rs-5y for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Om51H-0000wy-TY for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:19:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63408) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Om51H-0000wi-Kk for qemu-devel@nongnu.org; Thu, 19 Aug 2010 09:18:59 -0400 From: Luiz Capitulino Date: Thu, 19 Aug 2010 10:18:39 -0300 Message-Id: <1282223922-5971-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> References: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] set proper migration status on ->write error (v5) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Marcelo Tosatti , qemu-devel@nongnu.org From: Marcelo Tosatti 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 Signed-off-by: Luiz Capitulino --- buffered_file.c | 4 +++- migration.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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 650eb78..dbb8fd6 100644 --- a/migration.c +++ b/migration.c @@ -314,8 +314,14 @@ 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) { + if (s->mon) { + monitor_resume(s->mon); + } + s->state = MIG_STATE_ERROR; + } return ret; } -- 1.7.2.1.97.g3235b