From patchwork Wed Jul 7 18:04:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 58138 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 336E4B6F07 for ; Thu, 8 Jul 2010 04:06:29 +1000 (EST) Received: from localhost ([127.0.0.1]:40856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWZ0E-0005dm-VI for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 14:05:47 -0400 Received: from [140.186.70.92] (port=54347 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWYzK-0005bt-PN for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWYzH-0001jA-NS for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:04:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19124) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWYzH-0001iw-Fc for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:04:47 -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 o67I4iuE012069 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Jul 2010 14:04:44 -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 o67I4hE3017034; Wed, 7 Jul 2010 14:04:44 -0400 Received: from amt.cnet (vpn-10-241.rdu.redhat.com [10.11.10.241]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o67I4fob008732; Wed, 7 Jul 2010 14:04:43 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 050D065600F; Wed, 7 Jul 2010 15:04:15 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o67I4Be6017987; Wed, 7 Jul 2010 15:04:11 -0300 Date: Wed, 7 Jul 2010 15:04:11 -0300 From: Marcelo Tosatti To: Anthony Liguori , Juan Quintela Message-ID: <20100707180411.GA17569@amt.cnet> MIME-Version: 1.0 Content-Disposition: inline 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 Subject: [Qemu-devel] [PATCH] set proper migration status on ->write error 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..5bf2f4e 100644 --- a/migration.c +++ b/migration.c @@ -318,6 +318,8 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size) if (ret == -EAGAIN) qemu_set_fd_handler2(s->fd, NULL, NULL, migrate_fd_put_notify, s); + else + s->state = MIG_STATE_ERROR; return ret; }