From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90B45C432C2 for ; Wed, 25 Sep 2019 15:12:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61CFF21D7B for ; Wed, 25 Sep 2019 15:12:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61CFF21D7B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD8y4-0002tc-7m for qemu-devel@archiver.kernel.org; Wed, 25 Sep 2019 11:12:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57667) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD8nr-0000re-IV for qemu-devel@nongnu.org; Wed, 25 Sep 2019 11:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD8nq-0004fW-D5 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 11:02:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59684) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD8nq-0004f2-79 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 11:02:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A98E3086208; Wed, 25 Sep 2019 15:02:01 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-251.ams2.redhat.com [10.36.117.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18B865C220; Wed, 25 Sep 2019 15:01:51 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com, marcandre.lureau@redhat.com, richardw.yang@linux.intel.com, alex.benee@linaro.org Subject: [PULL 5/9] migration/rdma: Don't moan about disconnects at the end Date: Wed, 25 Sep 2019 16:01:26 +0100 Message-Id: <20190925150130.12303-6-dgilbert@redhat.com> In-Reply-To: <20190925150130.12303-1-dgilbert@redhat.com> References: <20190925150130.12303-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 25 Sep 2019 15:02:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" If we've already finished the migration or something has already gone wrong, don't moan about the migration stream disconnecting. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20190913163507.1403-2-dgilbert@redhat.com> Reviewed-by: Peter Xu Signed-off-by: Dr. David Alan Gilbert --- migration/rdma.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 78e6b72bac..0fcf02f48e 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3253,10 +3253,14 @@ static void rdma_cm_poll_handler(void *opaque) =20 if (cm_event->event =3D=3D RDMA_CM_EVENT_DISCONNECTED || cm_event->event =3D=3D RDMA_CM_EVENT_DEVICE_REMOVAL) { - error_report("receive cm event, cm event is %d", cm_event->event= ); - rdma->error_state =3D -EPIPE; - if (rdma->return_path) { - rdma->return_path->error_state =3D -EPIPE; + if (!rdma->error_state && + migration_incoming_get_current()->state !=3D + MIGRATION_STATUS_COMPLETED) { + error_report("receive cm event, cm event is %d", cm_event->e= vent); + rdma->error_state =3D -EPIPE; + if (rdma->return_path) { + rdma->return_path->error_state =3D -EPIPE; + } } =20 if (mis->migration_incoming_co) { --=20 2.21.0