From nobody Sun Apr 28 18:55:51 2024 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149031760828830.26999545143235; Thu, 23 Mar 2017 18:06:48 -0700 (PDT) Received: from localhost ([::1]:59386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crDgl-0007YD-5g for importer@patchew.org; Thu, 23 Mar 2017 21:06:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crDfg-0006z6-9h for qemu-devel@nongnu.org; Thu, 23 Mar 2017 21:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crDfd-0004Eq-5I for qemu-devel@nongnu.org; Thu, 23 Mar 2017 21:05:40 -0400 Received: from mx7.zte.com.cn ([202.103.147.169]:52648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crDfc-0004DN-Ia for qemu-devel@nongnu.org; Thu, 23 Mar 2017 21:05:37 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 24 Mar 2017 01:02:37 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v2O155Ya067861; Fri, 24 Mar 2017 09:05:05 +0800 (GMT-8) (envelope-from wang.guang55@zte.com.cn) Received: from localhost.localdomain ([10.74.120.79]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017032409051039-69939 ; Fri, 24 Mar 2017 09:05:10 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170324090237 From: Guang Wang To: berrange@redhat.com Date: Fri, 24 Mar 2017 09:04:49 +0800 Message-Id: <1490317489-3544-1-git-send-email-wang.guang55@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-03-24 09:05:10, Serialize by Router on notes_smtp/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-03-24 09:05:05, Serialize complete at 2017-03-24 09:05:05 X-MAIL: mse01.zte.com.cn v2O155Ya067861 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 202.103.147.169 Subject: [Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_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: Wang guang , zhang.zhanghailiang@huawei.com, zhangchen.fnst@cn.fujitsu.com, qemu-devel@nongnu.org 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" From: Wang guang The channel socket was initialized manually,=20 but forgot to set QIO_CHANNEL_FEATURE_SHUTDOWN. Thus, the colo_process_incoming_thread would hang at recvmsg. This patch just call qio_channel_socket_new to get channel, Which set QIO_CHANNEL_FEATURE_SHUTDOWN already. Signed-off-by: Wang Guang Signed-off-by: zhanghailiang Reviewed-by: Eric Blake --- io/channel-socket.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/io/channel-socket.c b/io/channel-socket.c index f546c68..64b36f5 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -331,16 +331,10 @@ qio_channel_socket_accept(QIOChannelSocket *ioc, { QIOChannelSocket *cioc; =20 - cioc =3D QIO_CHANNEL_SOCKET(object_new(TYPE_QIO_CHANNEL_SOCKET)); - cioc->fd =3D -1; + cioc =3D qio_channel_socket_new(); cioc->remoteAddrLen =3D sizeof(ioc->remoteAddr); cioc->localAddrLen =3D sizeof(ioc->localAddr); =20 -#ifdef WIN32 - QIO_CHANNEL(cioc)->event =3D CreateEvent(NULL, FALSE, FALSE, NULL); -#endif - - retry: trace_qio_channel_socket_accept(ioc); cioc->fd =3D qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr, --=20 1.8.3.1