From nobody Mon Feb 9 19:52:31 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.zohomail.com; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151384547032056.51986262316484; Thu, 21 Dec 2017 00:37:50 -0800 (PST) Received: from localhost ([::1]:39271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRwMH-0000rq-Kt for importer@patchew.org; Thu, 21 Dec 2017 03:37:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRwKJ-0007xZ-Bo for qemu-devel@nongnu.org; Thu, 21 Dec 2017 03:35:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRwKH-0006Ca-Pb for qemu-devel@nongnu.org; Thu, 21 Dec 2017 03:35:39 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:39136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRwKH-0006C6-Fn for qemu-devel@nongnu.org; Thu, 21 Dec 2017 03:35:37 -0500 Received: by mail-wm0-x241.google.com with SMTP id i11so14172567wmf.4 for ; Thu, 21 Dec 2017 00:35:37 -0800 (PST) Received: from donizetti.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id 26sm29752439wrw.19.2017.12.21.00.35.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Dec 2017 00:35:34 -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=Wq6D8c4mdeSYohbJkvy8E32RXjhhk8PGUGEW3oe6aRA=; b=ujpxIgRvFaunUyLAACUEtjBOApagtEGZh3KFqavvxks90j+L7FwOGsetytZiKq3apa gOT3IUffyT0egnjvvlDgsk/lloLMG3RESI7T+4sh5nty4DyWriRaiS7A2B06Ghbt2m09 61McrtKVpgkTpIE/UzMoAw7mw9E904ol5gvai44bTnlYNso1H6ciPK8zZqwZdskaOYM8 Dyf5iQC/UKkFyGf/Gv6bETxHBzzdLFPt9sJFZpDOYCzlt/VKxOisYE4erKfj6bYFZkKB 5zTiDk8YWh6r9+XlR9WGnnzhe+6cq3Q0oh+mQgyqrjifABP2Vs0ODK7zVB4dprurjLqG 2NSA== 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=Wq6D8c4mdeSYohbJkvy8E32RXjhhk8PGUGEW3oe6aRA=; b=j12qQZ6I9neHqx53dMCp/oQ6oS8q5z5TqG1L/asPwv3U+qK4sBGvlTzWirUY70JRFr uidno8yz5P8t2NCPxpmnKI6WvNIit/s5SgQRn72m0dOMJ3eF+3GtT5L/mTYzVaLuFkRS 9/98rbK8B8yC1CnWrPR30H6qQe+oTLwGKrAaPu9PR+aZqytb7ffv/NYwVcVAX4eYvkjd 1CSGhBMWy5ddlolVLbVsGeeaIdKSapqHqUWfCAcPCov9fEh6AFKmWl70rAEl88k0PoPQ Ry7vX8Kuh333AJJon7doyJkcE6Y5vLDvjFfRH8544Y2Aa/Xs6cJ9DqDqE9ad+tBUmC7z mFVg== X-Gm-Message-State: AKGB3mIbDQQajR4tp5waBxJ3HdFZnV/fHrZzXxMuzOfDbc1V6EjrtdJU 1mUBrFDXbE6Bt/ZGg71jRZqmrZtn X-Google-Smtp-Source: ACJfBou16o4ZpbKpmsnxoqziYSSLrTgbkqYGifz+0Yjga+Hza8Q41O/zkAU9fwemP4h7wgoDfQkzEQ== X-Received: by 10.28.196.70 with SMTP id u67mr9737586wmf.100.1513845335731; Thu, 21 Dec 2017 00:35:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 21 Dec 2017 09:35:29 +0100 Message-Id: <20171221083529.6982-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171221083529.6982-1-pbonzini@redhat.com> References: <20171221083529.6982-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 41/41] chardev: convert the socket 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_0 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 chardev 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. Signed-off-by: Daniel P. Berrange Message-Id: <20171218135417.28301-2-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 73 +++++++++++++++++++++--------------------------= ---- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 53eda8ef00..630a7f2995 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -25,6 +25,7 @@ #include "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" +#include "io/net-listener.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" @@ -40,8 +41,7 @@ typedef struct { Chardev parent; QIOChannel *ioc; /* Client I/O channel */ QIOChannelSocket *sioc; /* Client master channel */ - QIOChannelSocket *listen_ioc; - guint listen_tag; + QIONetListener *listener; QCryptoTLSCreds *tls_creds; int connected; int max_size; @@ -93,9 +93,9 @@ static void check_report_connect_error(Chardev *chr, qemu_chr_socket_restart_timer(chr); } =20 -static gboolean tcp_chr_accept(QIOChannel *chan, - GIOCondition cond, - void *opaque); +static void tcp_chr_accept(QIONetListener *listener, + QIOChannelSocket *cioc, + void *opaque); =20 static int tcp_chr_read_poll(void *opaque); static void tcp_chr_disconnect(Chardev *chr); @@ -401,9 +401,9 @@ static void tcp_chr_disconnect(Chardev *chr) =20 tcp_chr_free_connection(chr); =20 - if (s->listen_ioc && s->listen_tag =3D=3D 0) { - s->listen_tag =3D qio_channel_add_watch( - QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL= ); + if (s->listener) { + qio_net_listener_set_client_func(s->listener, tcp_chr_accept, + chr, NULL); } update_disconnected_filename(s); if (emit_close) { @@ -702,9 +702,8 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelS= ocket *sioc) if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } - if (s->listen_tag) { - g_source_remove(s->listen_tag); - s->listen_tag =3D 0; + if (s->listener) { + qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); } =20 if (s->tls_creds) { @@ -736,24 +735,14 @@ static int tcp_chr_add_client(Chardev *chr, int fd) return ret; } =20 -static gboolean tcp_chr_accept(QIOChannel *channel, - GIOCondition cond, - void *opaque) +static void tcp_chr_accept(QIONetListener *listener, + QIOChannelSocket *cioc, + void *opaque) { Chardev *chr =3D CHARDEV(opaque); - QIOChannelSocket *sioc; - - sioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(channel), - NULL); - if (!sioc) { - return TRUE; - } - - tcp_chr_new_client(chr, sioc); =20 - object_unref(OBJECT(sioc)); - - return TRUE; + tcp_chr_set_client_ioc_name(chr, cioc); + tcp_chr_new_client(chr, cioc); } =20 static int tcp_chr_wait_connected(Chardev *chr, Error **errp) @@ -767,9 +756,10 @@ static int tcp_chr_wait_connected(Chardev *chr, Error = **errp) if (s->is_listen) { info_report("QEMU waiting for connection on: %s", chr->filename); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NUL= L); - tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr); - qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NU= LL); + sioc =3D qio_net_listener_wait_client(s->listener); + tcp_chr_set_client_ioc_name(chr, sioc); + tcp_chr_new_client(chr, sioc); + object_unref(OBJECT(sioc)); } else { sioc =3D qio_channel_socket_new(); tcp_chr_set_client_ioc_name(chr, sioc); @@ -797,12 +787,9 @@ static void char_socket_finalize(Object *obj) s->reconnect_timer =3D 0; } qapi_free_SocketAddress(s->addr); - if (s->listen_tag) { - g_source_remove(s->listen_tag); - s->listen_tag =3D 0; - } - if (s->listen_ioc) { - object_unref(OBJECT(s->listen_ioc)); + if (s->listener) { + qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL); + object_unref(OBJECT(s->listener)); } if (s->tls_creds) { object_unref(OBJECT(s->tls_creds)); @@ -935,29 +922,29 @@ static void qmp_chardev_open_socket(Chardev *chr, } else { if (s->is_listen) { char *name; - sioc =3D qio_channel_socket_new(); + s->listener =3D qio_net_listener_new(); =20 name =3D g_strdup_printf("chardev-tcp-listener-%s", chr->label= ); - qio_channel_set_name(QIO_CHANNEL(sioc), name); + qio_net_listener_set_name(s->listener, name); g_free(name); =20 - if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) { + if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0= ) { + object_unref(OBJECT(s->listener)); + s->listener =3D NULL; goto error; } =20 qapi_free_SocketAddress(s->addr); - s->addr =3D socket_local_address(sioc->fd, errp); + s->addr =3D socket_local_address(s->listener->sioc[0]->fd, err= p); update_disconnected_filename(s); =20 - s->listen_ioc =3D sioc; if (is_waitconnect && qemu_chr_wait_connected(chr, errp) < 0) { return; } if (!s->ioc) { - s->listen_tag =3D qio_channel_add_watch( - QIO_CHANNEL(s->listen_ioc), G_IO_IN, - tcp_chr_accept, chr, NULL); + qio_net_listener_set_client_func(s->listener, tcp_chr_acce= pt, + chr, NULL); } } else if (qemu_chr_wait_connected(chr, errp) < 0) { goto error; --=20 2.14.3