From patchwork Wed Jul 14 00:01:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 58825 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 C7C39B6F14 for ; Wed, 14 Jul 2010 10:14:58 +1000 (EST) Received: from localhost ([127.0.0.1]:45407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYpck-0005g6-J0 for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2010 20:14:54 -0400 Received: from [140.186.70.92] (port=44624 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYpc6-0005fz-AY for qemu-devel@nongnu.org; Tue, 13 Jul 2010 20:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYpc5-0007P4-9s for qemu-devel@nongnu.org; Tue, 13 Jul 2010 20:14:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35761) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYpc5-0007On-2s for qemu-devel@nongnu.org; Tue, 13 Jul 2010 20:14:13 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6E0EBO6028059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Jul 2010 20:14:11 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6E0EAJV009683; Tue, 13 Jul 2010 20:14:10 -0400 Received: from amt.cnet (vpn-9-207.rdu.redhat.com [10.11.9.207]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o6E0E9HG005253; Tue, 13 Jul 2010 20:14:09 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 9C2C57A03F; Tue, 13 Jul 2010 21:01:35 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o6E01YSb010616; Tue, 13 Jul 2010 21:01:34 -0300 Date: Tue, 13 Jul 2010 21:01:33 -0300 From: Marcelo Tosatti To: Luiz Capitulino Message-ID: <20100714000133.GA10547@amt.cnet> References: <20100707180411.GA17569@amt.cnet> <20100709181851.GB7444@amt.cnet> <20100712223339.4b53ed36@redhat.com> <20100713173022.GA32561@amt.cnet> <20100713193539.56a2522b@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100713193539.56a2522b@redhat.com> User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org, Juan Quintela Subject: [Qemu-devel] [PATCH] 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 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 Reviewed-by: Luiz Capitulino 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..f8e6325 100644 --- a/migration.c +++ b/migration.c @@ -316,8 +316,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; }