From nobody Mon Feb 9 20:35:00 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1513792656986423.13764314742514; Wed, 20 Dec 2017 09:57:36 -0800 (PST) Received: from localhost ([::1]:60810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRicM-00069c-Sc for importer@patchew.org; Wed, 20 Dec 2017 12:57:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhym-00054j-RH for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyi-0007Qf-K4 for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:28 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:43969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyi-0007QA-DM for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:24 -0500 Received: by mail-wr0-x241.google.com with SMTP id w68so10470396wrc.10 for ; Wed, 20 Dec 2017 09:16:24 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=yWFRA+uTgz+LzZWwFbc94DTUFKZn+fqlQC6vq0jh09Q=; b=eiJEMdErIbiy/ZzTmIdOAhUCEk9XEfMUt0AGjPRriXl+bYA40jyzrnxSNdgcCn8lKr wxQY3NSCOAIOBdrCGPti+10VK7LxL8zWCL9LiZXEL39ZOkObuiOOfK/v+841xXdSbCXx tupdiS0DN58YeOpg8Is3ooy+JnIRXcdeZgJ+WYQ8QXkye/7A7OoM0UrVR3ubBMK1s5Vl lgEzp5+LEGAtbX4PF4NcoWi1L77+MI98JWFlYV8QreYSXcWDDgf6N6FNdIEGl1e9GDF0 MjfhILDSWudfyw0/xFvo/kvWWOVTMuNL8NvgK4DrsjtPpcrtQw4oF76y/RAnJ7RqjvAX stFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=yWFRA+uTgz+LzZWwFbc94DTUFKZn+fqlQC6vq0jh09Q=; b=d+viFA3e8CI6Vj0OD7S7sOfUZ9m/POuwG0LOnu4/QjAVZyKMs0a2lzCRX4rZxAfM4D pNpheZoqxKTwdDE0gOUjqxbW5djMMb9HFzGzLc6C2E55zb5pEnQuV+yBRW+DD5fe9FON +YLhtefW/79mWMqCvMZH9I+IzRUXT+0wgq57TV8FAYz7CbWai0EQEjKTVQcz4hMeU9Vf cam3UJoxFzL2ehetPjJ4WWF495IV0SRZYbGDgcLrK7XwOm2+h6c7Qi4XD7TlsVGLV8A0 N9KV/74xXL602+3PFgHkLhNmWtLpAmoFOmUiJqJ6K18blnXfIyo6j9249WUcsatbrbS7 923A== X-Gm-Message-State: AKGB3mImBTTv6iHr/mGl/AlyKRpotJBk9r6iRvEUHr0nA15wXU6kMKas W8Dp4s54GI3XJMg3SDP7VxGSmS/M X-Google-Smtp-Source: ACJfBotPsU6PMi+1muTYJm/ZgjXsUEwXg6ZNQIgYK1GIVVMVqB3GeGM2jFQEneIWg9QGRve1LOLYyg== X-Received: by 10.223.131.132 with SMTP id 4mr8644393wre.217.1513790183093; Wed, 20 Dec 2017 09:16:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:56 +0100 Message-Id: <1513790098-9815-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 44/46] blockdev: convert internal NBD server to QIONetListener 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" Instead of creating a QIOChannelSocket directly for the NBD server socket, use a QIONetListener. This provides the ability to listen on multiple sockets at the same time, so enables full support for IPv4/IPv6 dual stack. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Message-Id: <20171218101643.20360-2-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- blockdev-nbd.c | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 28f551a..9e3c221 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -18,10 +18,10 @@ #include "qmp-commands.h" #include "block/nbd.h" #include "io/channel-socket.h" +#include "io/net-listener.h" =20 typedef struct NBDServerData { - QIOChannelSocket *listen_ioc; - int watch; + QIONetListener *listener; QCryptoTLSCreds *tlscreds; } NBDServerData; =20 @@ -32,27 +32,13 @@ static void nbd_blockdev_client_closed(NBDClient *clien= t, bool ignored) nbd_client_put(client); } =20 -static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition, - gpointer opaque) +static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc, + gpointer opaque) { - QIOChannelSocket *cioc; - - if (!nbd_server) { - return FALSE; - } - - cioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), - NULL); - if (!cioc) { - return TRUE; - } - qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server"); nbd_client_new(NULL, cioc, nbd_server->tlscreds, NULL, nbd_blockdev_client_closed); - object_unref(OBJECT(cioc)); - return TRUE; } =20 =20 @@ -62,10 +48,8 @@ static void nbd_server_free(NBDServerData *server) return; } =20 - if (server->watch !=3D -1) { - g_source_remove(server->watch); - } - object_unref(OBJECT(server->listen_ioc)); + qio_net_listener_disconnect(server->listener); + object_unref(OBJECT(server->listener)); if (server->tlscreds) { object_unref(OBJECT(server->tlscreds)); } @@ -112,12 +96,12 @@ void nbd_server_start(SocketAddress *addr, const char = *tls_creds, } =20 nbd_server =3D g_new0(NBDServerData, 1); - nbd_server->watch =3D -1; - nbd_server->listen_ioc =3D qio_channel_socket_new(); - qio_channel_set_name(QIO_CHANNEL(nbd_server->listen_ioc), - "nbd-listener"); - if (qio_channel_socket_listen_sync( - nbd_server->listen_ioc, addr, errp) < 0) { + nbd_server->listener =3D qio_net_listener_new(); + + qio_net_listener_set_name(nbd_server->listener, + "nbd-listener"); + + if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) { goto error; } =20 @@ -134,12 +118,10 @@ void nbd_server_start(SocketAddress *addr, const char= *tls_creds, } } =20 - nbd_server->watch =3D qio_channel_add_watch( - QIO_CHANNEL(nbd_server->listen_ioc), - G_IO_IN, - nbd_accept, - NULL, - NULL); + qio_net_listener_set_client_func(nbd_server->listener, + nbd_accept, + NULL, + NULL); =20 return; =20 --=20 1.8.3.1