From nobody Sat Oct 25 08:55:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520421077978435.4526428769407; Wed, 7 Mar 2018 03:11:17 -0800 (PST) Received: from localhost ([::1]:60786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etWyb-0005iU-77 for importer@patchew.org; Wed, 07 Mar 2018 06:11:17 -0500 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) Received: from secure.mitica (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 960EE215CDA7; Wed, 7 Mar 2018 11:00:30 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 07 Mar 2018 11:00:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 07 Mar 2018 11:00:31 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'quintela@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v10 10/24] migration: In case of error just end the migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 --- 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(QIOCha= nnel *ioc, sioc =3D 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; } =20 trace_migration_socket_incoming_accepted(); @@ -150,7 +149,6 @@ static gboolean socket_accept_incoming_migration(QIOCha= nnel *ioc, migration_channel_process_incoming(QIO_CHANNEL(sioc)); object_unref(OBJECT(sioc)); =20 -out: if (migration_has_all_channels()) { /* Close listening socket as its no longer needed */ qio_channel_close(ioc, NULL); --=20 2.14.3