From nobody Mon Feb 9 17:08:05 2026 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 1493194043514463.95408931495103; Wed, 26 Apr 2017 01:07:23 -0700 (PDT) Received: from localhost ([::1]:53470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Hyr-0007xg-Vt for importer@patchew.org; Wed, 26 Apr 2017 04:07:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3HxI-0006e0-42 for qemu-devel@nongnu.org; Wed, 26 Apr 2017 04:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3HxB-0002wk-Vl for qemu-devel@nongnu.org; Wed, 26 Apr 2017 04:05:44 -0400 Received: from [59.151.112.132] (port=16366 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3HxB-0002ta-Iu for qemu-devel@nongnu.org; Wed, 26 Apr 2017 04:05:37 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Apr 2017 16:05:26 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 3EB8547E6342; Wed, 26 Apr 2017 16:05:25 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 26 Apr 2017 16:05:25 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18175349" From: Mao Zhongyi To: Date: Wed, 26 Apr 2017 16:04:15 +0800 Message-ID: <6824abf3c4e5b865de1799c302f60e8055c8d3dc.1493191677.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 3EB8547E6342.A09CC X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v2 1/4] net/socket: Convert the non-blocking connection mechanism to QIOchannel 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: pbonzini@redhat.com, jasowang@redhat.com 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 Content-Type: text/plain; charset="utf-8" Currently, socket connection in net is realized by an old mechanism which is non-blocking. That old mechanism may cause net blocks on DNS lookups and QEmu has already replaced it with QIOchannel in many features, such as migration. Convert it to QIOchannel for net as well. CC: berrange@redhat.com, pbonzini@redhat.com, jasowang@redhat.com Signed-off-by: Mao Zhongyi --- The test steps like this: $ qemu-system-x86_64 -net nic -net socket,listen=3D:1234 ~/img/test.img $ qemu-system-x86_64 -net nic -net socket,connect=3D127.0.0.1:1234 ~/im= g/test.img No exception. net/socket.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/net/socket.c b/net/socket.c index b8c931e..52f9dce 100644 --- a/net/socket.c +++ b/net/socket.c @@ -33,6 +33,7 @@ #include "qemu/sockets.h" #include "qemu/iov.h" #include "qemu/main-loop.h" +#include "io/channel-socket.h" =20 typedef struct NetSocketState { NetClientState nc; @@ -525,16 +526,22 @@ typedef struct { char *name; } socket_connect_data; =20 -static void socket_connect_data_free(socket_connect_data *c) +static void socket_connect_data_free(void *opaque) { + socket_connect_data *c =3D opaque; + if (!c) { + return; + } + qapi_free_SocketAddress(c->saddr); g_free(c->model); g_free(c->name); g_free(c); } =20 -static void net_socket_connected(int fd, Error *err, void *opaque) +static void net_socket_connected(QIOTask *task, void *opaque) { + QIOChannelSocket *sioc =3D QIO_CHANNEL_SOCKET(qio_task_get_source(task= )); socket_connect_data *c =3D opaque; NetSocketState *s; char *addr_str =3D NULL; @@ -543,13 +550,13 @@ static void net_socket_connected(int fd, Error *err, = void *opaque) addr_str =3D socket_address_to_string(c->saddr, &local_error); if (addr_str =3D=3D NULL) { error_report_err(local_error); - closesocket(fd); + closesocket(sioc->fd); goto end; } =20 - s =3D net_socket_fd_init(c->peer, c->model, c->name, fd, true); + s =3D net_socket_fd_init(c->peer, c->model, c->name, sioc->fd, true); if (!s) { - closesocket(fd); + closesocket(sioc->fd); goto end; } =20 @@ -567,7 +574,7 @@ static int net_socket_connect_init(NetClientState *peer, const char *host_str) { socket_connect_data *c =3D g_new0(socket_connect_data, 1); - int fd =3D -1; + QIOChannelSocket *sioc; Error *local_error =3D NULL; =20 c->peer =3D peer; @@ -578,11 +585,12 @@ static int net_socket_connect_init(NetClientState *pe= er, goto err; } =20 - fd =3D socket_connect(c->saddr, net_socket_connected, c, &local_error); - if (fd < 0) { - goto err; - } - + sioc =3D qio_channel_socket_new(); + qio_channel_socket_connect_async(sioc, + c->saddr, + net_socket_connected, + c, + NULL); return 0; =20 err: --=20 2.9.3