From patchwork Thu Aug 19 13:18:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 62154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B94A9B70E7 for ; Thu, 19 Aug 2010 23:22:12 +1000 (EST) Received: from localhost ([127.0.0.1]:36512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Om54K-0008SC-Ba for incoming@patchwork.ozlabs.org; Thu, 19 Aug 2010 09:22:08 -0400 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 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7JDIw9A023710 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 19 Aug 2010 09:18:59 -0400 Received: from localhost (ovpn-113-87.phx2.redhat.com [10.3.113.87]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7JDIvaS004928; Thu, 19 Aug 2010 09:18:58 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Marcelo Tosatti , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/4] set proper migration status on ->write error (v5) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }