From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXoLu-0006o4-PL for qemu-devel@nongnu.org; Thu, 11 Aug 2016 07:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXoLr-0001jH-Is for qemu-devel@nongnu.org; Thu, 11 Aug 2016 07:40:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXoLr-0001j4-8f for qemu-devel@nongnu.org; Thu, 11 Aug 2016 07:40:43 -0400 From: Amit Shah Date: Thu, 11 Aug 2016 17:09:42 +0530 Message-Id: <474c624ddf0d390b850526a01026ef8737e67ca7.1470915381.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL 2.7 4/4] migration/socket: fix typo in file header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu list , caoj.fnst@cn.fujitsu.com, eyakovlev@virtuozzo.com, den@openvz.org, liang.z.li@intel.com, "Dr. David Alan Gilbert" , Juan Quintela , "Daniel P . Berrange" , Amit Shah From: Cao jin Code of inet socket & unix socket is merged together. Also add some newlines, make code block well separated. Cc: Daniel P. Berrange Cc: Juan Quintela Cc: Amit Shah Reviewed-by: Daniel P. Berrange Signed-off-by: Cao jin Message-Id: <1469696074-12744-4-git-send-email-caoj.fnst@cn.fujitsu.com> Signed-off-by: Amit Shah --- migration/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/socket.c b/migration/socket.c index 5c0a38f..00de1fe 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -1,5 +1,5 @@ /* - * QEMU live migration via Unix Domain Sockets + * QEMU live migration via socket * * Copyright Red Hat, Inc. 2009-2016 * @@ -94,10 +94,12 @@ static void socket_start_outgoing_migration(MigrationState *s, { QIOChannelSocket *sioc = qio_channel_socket_new(); struct SocketConnectData *data = g_new0(struct SocketConnectData, 1); + data->s = s; if (saddr->type == SOCKET_ADDRESS_KIND_INET) { data->hostname = g_strdup(saddr->u.inet.data->host); } + qio_channel_socket_connect_async(sioc, saddr, socket_outgoing_migration, -- 2.7.4