From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmfaH-0003Rl-12 for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:30:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmfaE-0008Ja-PZ for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:30:05 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:38965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmfaE-0008JF-Iy for qemu-devel@nongnu.org; Mon, 06 Aug 2018 09:30:02 -0400 Received: by mail-pg1-x542.google.com with SMTP id a11-v6so6234614pgw.6 for ; Mon, 06 Aug 2018 06:30:02 -0700 (PDT) From: Lidong Chen Date: Mon, 6 Aug 2018 21:29:36 +0800 Message-Id: <1533562177-16447-11-git-send-email-lidongchen@tencent.com> In-Reply-To: <1533562177-16447-1-git-send-email-lidongchen@tencent.com> References: <1533562177-16447-1-git-send-email-lidongchen@tencent.com> Subject: [Qemu-devel] [PATCH v6 10/11] migration: remove the unnecessary RDMA_CONTROL_ERROR message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com Cc: qemu-devel@nongnu.org, Lidong Chen It's not necessary to send RDMA_CONTROL_ERROR when clean up rdma resource. If rdma->error_state is ture, the message may not send successfully. and the cm event can also notify the peer qemu. Signed-off-by: Lidong Chen --- migration/rdma.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index ae07515..e1498f2 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2305,17 +2305,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) int idx; if (rdma->cm_id && rdma->connected) { - if ((rdma->error_state || - migrate_get_current()->state == MIGRATION_STATUS_CANCELLING) && - !rdma->received_error) { - RDMAControlHeader head = { .len = 0, - .type = RDMA_CONTROL_ERROR, - .repeat = 1, - }; - error_report("Early error. Sending error."); - qemu_rdma_post_send_control(rdma, NULL, &head); - } - rdma_disconnect(rdma->cm_id); trace_qemu_rdma_cleanup_disconnect(); rdma->connected = false; -- 1.8.3.1