From patchwork Wed Jul 7 19:42:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 58160 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 E7199B6F05 for ; Thu, 8 Jul 2010 05:49:33 +1000 (EST) Received: from localhost ([127.0.0.1]:51190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWaa1-0005am-8B for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 15:46:49 -0400 Received: from [140.186.70.92] (port=57457 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWaYs-0005Xt-Uu for qemu-devel@nongnu.org; Wed, 07 Jul 2010 15:45:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWaYo-0003yX-3p for qemu-devel@nongnu.org; Wed, 07 Jul 2010 15:45:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65403) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWaYn-0003yM-Ry for qemu-devel@nongnu.org; Wed, 07 Jul 2010 15:45:34 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o67JjVjw027618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Jul 2010 15:45:31 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o67JjUE0016396; Wed, 7 Jul 2010 15:45:31 -0400 Received: from amt.cnet (vpn-11-44.rdu.redhat.com [10.11.11.44]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o67JjSso019531; Wed, 7 Jul 2010 15:45:30 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id DA3CD65600F; Wed, 7 Jul 2010 16:45:13 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o67JgYPa019449; Wed, 7 Jul 2010 16:42:34 -0300 Date: Wed, 7 Jul 2010 16:42:34 -0300 From: Marcelo Tosatti To: Blue Swirl Message-ID: <20100707194234.GA18116@amt.cnet> References: <20100707180411.GA17569@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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 (v2) 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 Acked-by: Juan Quintela 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..433f08f 100644 --- a/migration.c +++ b/migration.c @@ -316,8 +316,11 @@ 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 { + s->state = MIG_STATE_ERROR; + } return ret; }