From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38A1CC4332F for ; Fri, 21 Oct 2022 10:35:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.427558.676747 (Exim 4.92) (envelope-from ) id 1olpNK-0005lo-63; Fri, 21 Oct 2022 10:35:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 427558.676747; Fri, 21 Oct 2022 10:35:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olpNK-0005lh-2g; Fri, 21 Oct 2022 10:35:38 +0000 Received: by outflank-mailman (input) for mailman id 427558; Fri, 21 Oct 2022 10:35:36 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1olpNI-0005lQ-HM for xen-devel@lists.xenproject.org; Fri, 21 Oct 2022 10:35:36 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f4ca3c33-512b-11ed-8fd0-01056ac49cbb; Fri, 21 Oct 2022 12:34:35 +0200 (CEST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-449-3eY7vKtJMmWUC5Xz_P5i2w-1; Fri, 21 Oct 2022 06:35:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8A5E5185A7A3; Fri, 21 Oct 2022 10:35:30 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.118]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 281612024CBF; Fri, 21 Oct 2022 10:35:30 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 11F0C21E6686; Fri, 21 Oct 2022 12:35:29 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f4ca3c33-512b-11ed-8fd0-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666348534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wOEGEZqptswKIUfgBEEm4tgnEbbBtNC3oZfW8NqaNe0=; b=O+TCiuSXwLedaKyc2JsnmmXQGmxmpZYK3D+BYcHZg1BRoW91VMxO8m7eqdJRHCaSW4DVOJ /ZCsVy6pd8eOJJ4AqAvvHNnflR+p2l7kZZJ9R/lORG2Qjp0XrqtaZIr/nk01lZXFkqA9g3 7AQSJ9/nhLRMIrjDt7Z7SKkqnJw4R+g= X-MC-Unique: 3eY7vKtJMmWUC5Xz_P5i2w-1 From: Markus Armbruster To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: Laurent Vivier , qemu-devel@nongnu.org, Thomas Huth , xen-devel@lists.xenproject.org, "Dr. David Alan Gilbert" , Anthony Perard , Stefan Weil , David Gibson , Stefano Stabellini , Paul Durrant , Eric Blake , "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Samuel Thibault , Greg Kurz , Daniel P. =?utf-8?Q?Berrang=C3=A9?= Subject: Re: [PATCH v14 15/17] net: stream: move to QIO to enable additional parameters References: <20221021090922.170074-1-lvivier@redhat.com> <20221021090922.170074-16-lvivier@redhat.com> <1f769d00-cf50-abaf-f078-f301959156b9@linaro.org> Date: Fri, 21 Oct 2022 12:35:29 +0200 In-Reply-To: <1f769d00-cf50-abaf-f078-f301959156b9@linaro.org> ("Philippe =?utf-8?Q?Mathieu-Daud=C3=A9=22's?= message of "Fri, 21 Oct 2022 12:05:42 +0200") Message-ID: <87tu3x1n2m.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Philippe Mathieu-Daud=C3=A9 writes: > On 21/10/22 11:09, Laurent Vivier wrote: >> Use QIOChannel, QIOChannelSocket and QIONetListener. >> This allows net/stream to use all the available parameters provided by >> SocketAddress. >> Signed-off-by: Laurent Vivier >> Acked-by: Michael S. Tsirkin >> --- >> net/stream.c | 492 +++++++++++++++++------------------------------- >> qemu-options.hx | 4 +- >> 2 files changed, 178 insertions(+), 318 deletions(-) > >> -static void net_stream_accept(void *opaque) >> +static void net_stream_server_listening(QIOTask *task, gpointer opaque) >> { >> NetStreamState *s =3D opaque; >> - struct sockaddr_storage saddr; >> - socklen_t len; >> - int fd; >> - >> - for (;;) { >> - len =3D sizeof(saddr); >> - fd =3D qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &le= n); >> - if (fd < 0 && errno !=3D EINTR) { >> - return; >> - } else if (fd >=3D 0) { >> - qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL); >> - break; >> - } >> - } >> + QIOChannelSocket *listen_sioc =3D QIO_CHANNEL_SOCKET(s->listen_ioc); >> + SocketAddress *addr; >> + int ret; >> - s->fd =3D fd; >> - s->nc.link_down =3D false; >> - net_stream_connect(s); >> - switch (saddr.ss_family) { >> - case AF_INET: { >> - struct sockaddr_in *saddr_in =3D (struct sockaddr_in *)&saddr; >> - >> - qemu_set_info_str(&s->nc, "connection from %s:%d", >> - inet_ntoa(saddr_in->sin_addr), >> - ntohs(saddr_in->sin_port)); >> - break; >> + if (listen_sioc->fd < 0) { >> + qemu_set_info_str(&s->nc, "connection error"); >> + return; >> } >> - case AF_UNIX: { >> - struct sockaddr_un saddr_un; >> - len =3D sizeof(saddr_un); >> - getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len); >> - qemu_set_info_str(&s->nc, "connect from %s", saddr_un.sun_path); >> - break; >> - } >> - default: >> - g_assert_not_reached(); >> + addr =3D qio_channel_socket_get_local_address(listen_sioc, NULL); >> + g_assert(addr !=3D NULL); > > Missing propagating Error* (observed in v12). *If* this is really a programming error: what about &error_abort? [...]