From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuzmw-0005o1-EG for qemu-devel@nongnu.org; Mon, 03 Apr 2017 07:04:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuzmt-0005Gv-OV for qemu-devel@nongnu.org; Mon, 03 Apr 2017 07:04:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cuzmt-0005Gm-Iq for qemu-devel@nongnu.org; Mon, 03 Apr 2017 07:04:43 -0400 Date: Mon, 3 Apr 2017 12:04:35 +0100 From: "Daniel P. Berrange" Message-ID: <20170403110435.GM2768@redhat.com> Reply-To: "Daniel P. Berrange" References: <1490317489-3544-1-git-send-email-wang.guang55@zte.com.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1490317489-3544-1-git-send-email-wang.guang55@zte.com.cn> Subject: Re: [Qemu-devel] [PATCH v2] migration: Fix colo hang in socket_accept_incoming_migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Guang Wang Cc: zhang.zhanghailiang@huawei.com, zhangchen.fnst@cn.fujitsu.com, eblake@redhat.com, qemu-devel@nongnu.org On Fri, Mar 24, 2017 at 09:04:49AM +0800, Guang Wang wrote: > From: Wang guang > > The channel socket was initialized manually, > 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(-) Looks good to me - I'll try to get this into 2.9 Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|