From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36642 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ps2qj-0002uT-KU for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ps2qi-0005Js-GG for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ps2qi-0005Ji-4a for qemu-devel@nongnu.org; Tue, 22 Feb 2011 19:45:00 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1N0ixVo001882 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Feb 2011 19:44:59 -0500 From: Juan Quintela Date: Wed, 23 Feb 2011 01:44:26 +0100 Message-Id: <85a3ad2293fc320bc67d06222d992742593065fa.1298421307.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 12/22] migration: Use migrate_fd_error() in last place that set status to ERROR List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org We are also calling to migrate_fd_cleanup(), but notice that it is the right thing to do. Signed-off-by: Juan Quintela --- migration.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index ab98664..3983257 100644 --- a/migration.c +++ b/migration.c @@ -351,11 +351,7 @@ static 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 if (ret < 0) { - if (s->mon) { - monitor_resume(s->mon); - } - s->state = MIG_STATE_ERROR; - notifier_list_notify(&migration_state_notifiers); + migrate_fd_error(s); } return ret; -- 1.7.4