From patchwork Thu Jun 16 19:28:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9181509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4969C60760 for ; Thu, 16 Jun 2016 19:29:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BE8F26785 for ; Thu, 16 Jun 2016 19:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 307B62837E; Thu, 16 Jun 2016 19:29:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D6AFA26785 for ; Thu, 16 Jun 2016 19:29:46 +0000 (UTC) Received: from localhost ([::1]:51789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDcz4-0001QL-0E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jun 2016 15:29:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDcyT-0001GU-MF for qemu-devel@nongnu.org; Thu, 16 Jun 2016 15:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDcyR-0004gL-NB for qemu-devel@nongnu.org; Thu, 16 Jun 2016 15:29:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDcyR-0004gH-GI for qemu-devel@nongnu.org; Thu, 16 Jun 2016 15:29:07 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06E61A70A for ; Thu, 16 Jun 2016 19:29:07 +0000 (UTC) Received: from localhost (ovpn-116-108.phx2.redhat.com [10.3.116.108]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5GJT27I021774; Thu, 16 Jun 2016 15:29:03 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 16 Jun 2016 21:28:51 +0200 Message-Id: <1466105332-10285-3-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1466105332-10285-1-git-send-email-marcandre.lureau@redhat.com> References: <1466105332-10285-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 16 Jun 2016 19:29:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] socket: add listen feature 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, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Add a flag to tell whether the channel socket is listening. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrange --- include/io/channel.h | 1 + io/channel-socket.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/io/channel.h b/include/io/channel.h index d37acd2..e52f059 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -42,6 +42,7 @@ typedef enum QIOChannelFeature QIOChannelFeature; enum QIOChannelFeature { QIO_CHANNEL_FEATURE_FD_PASS = (1 << 0), QIO_CHANNEL_FEATURE_SHUTDOWN = (1 << 1), + QIO_CHANNEL_FEATURE_LISTEN = (1 << 2), }; diff --git a/io/channel-socket.c b/io/channel-socket.c index ca8bc20..1cd5848 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -71,6 +71,9 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, int fd, Error **errp) { + int val; + socklen_t len = sizeof(val); + if (sioc->fd != -1) { error_setg(errp, "Socket is already open"); return -1; @@ -106,6 +109,10 @@ qio_channel_socket_set_fd(QIOChannelSocket *sioc, ioc->features |= (1 << QIO_CHANNEL_FEATURE_FD_PASS); } #endif /* WIN32 */ + if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &val, &len) == 0 && val) { + QIOChannel *ioc = QIO_CHANNEL(sioc); + ioc->features |= (1 << QIO_CHANNEL_FEATURE_LISTEN); + } return 0;