From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etWoG-0004uD-EZ for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etWoC-0006AJ-C3 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:36 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34490 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etWoC-00069w-8g for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:32 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2ABB4023B98 for ; Wed, 7 Mar 2018 11:00:31 +0000 (UTC) From: Juan Quintela Date: Wed, 7 Mar 2018 11:59:56 +0100 Message-Id: <20180307110010.2205-11-quintela@redhat.com> In-Reply-To: <20180307110010.2205-1-quintela@redhat.com> References: <20180307110010.2205-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v10 10/24] migration: In case of error just end the migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com Signed-off-by: Juan Quintela --- migration/socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/socket.c b/migration/socket.c index 08606c665d..b12b0a462e 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -139,9 +139,8 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), &err); if (!sioc) { - error_report("could not accept migration connection (%s)", - error_get_pretty(err)); - goto out; + migrate_set_error(migrate_get_current(), err); + return G_SOURCE_REMOVE; } trace_migration_socket_incoming_accepted(); @@ -150,7 +149,6 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, migration_channel_process_incoming(QIO_CHANNEL(sioc)); object_unref(OBJECT(sioc)); -out: if (migration_has_all_channels()) { /* Close listening socket as its no longer needed */ qio_channel_close(ioc, NULL); -- 2.14.3