From nobody Wed Feb 11 03:08:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640072601; cv=none; d=zohomail.com; s=zohoarc; b=GwSCwoXQwX2bneA9sUXk4IbHmgp8wZUJzz93Aq+Xp/G/zuJ77ZuWz4KH1hGvr3BUBRRiuHAdfn/tY8YZUOzBIFxr9krlr7LIhdKCLA9+r7z672BQVoEa4pbC5zJ6peZQyBJyB7QEoTG8Lr936DM2fjTOd8fvIwHxJNNPNn4Ld+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640072601; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WB0EunlAyKZDmJ6/3zULe+xmztbtKydoO4wGd40k5FY=; b=HslxOChfvTKdgUcRB7uXE16fnTbUSX8wrcwBQybd5G0D0GyGlgltOfFQO98iZBRKaH9FrTQwn09j68SvfqXy181iVfDMgsXaS2oqDvQfjfJp3E9OE6mtyuUzH7ivOY4j9OBEQ/TcVF/SPIixXZcbSMA/pVTgWj72NokmpRzCQWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1640072601124330.02799934223094; Mon, 20 Dec 2021 23:43:21 -0800 (PST) Received: from localhost ([::1]:54418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzZns-0000by-2x for importer@patchew.org; Tue, 21 Dec 2021 02:43:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzZFg-0002oQ-P7 for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:08:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzZFe-0002X4-VU for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:08:00 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-4-_6HyXyOHG6C3D6sOgm1g-1; Tue, 21 Dec 2021 02:07:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B68F01006AA5; Tue, 21 Dec 2021 07:07:54 +0000 (UTC) Received: from localhost (unknown [10.39.208.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BBB4105B20B; Tue, 21 Dec 2021 07:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640070478; 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=WB0EunlAyKZDmJ6/3zULe+xmztbtKydoO4wGd40k5FY=; b=S/OkJHPeCJ7YeMyRiGYQI5p+sU2SRyRKewHiVhVcLYFCTw+wltsppT0et0/c/DqEpfHGjV DJDb0ks2TqI8PS/Uj5P0ec9DLflwta0oaTn3vXD5+DALJRPPFAKTJQHEDbHaCJxBp3fnBz J2d70FcPc31Nd424m+iNFT9vvmv1rtk= X-MC-Unique: 4-_6HyXyOHG6C3D6sOgm1g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PULL v2 31/36] chardev: teach socket to accept no addresses Date: Tue, 21 Dec 2021 10:58:50 +0400 Message-Id: <20211221065855.142578-32-marcandre.lureau@redhat.com> In-Reply-To: <20211221065855.142578-1-marcandre.lureau@redhat.com> References: <20211221065855.142578-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640072602945100001 From: Marc-Andr=C3=A9 Lureau The following patches are going to use CharSocket as a base class for sockets that are created with a given fd (without a given address). Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Gerd Hoffmann --- chardev/char-socket.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 836cfa0bc21b..a2b02e021d6b 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1248,6 +1248,10 @@ static int qmp_chardev_open_socket_server(Chardev *c= hr, qio_net_listener_set_name(s->listener, name); g_free(name); =20 + if (s->addr->type =3D=3D SOCKET_ADDRESS_TYPE_FD && !*s->addr->u.fd.str= ) { + goto skip_listen; + } + if (qio_net_listener_open_sync(s->listener, s->addr, 1, errp) < 0) { object_unref(OBJECT(s->listener)); s->listener =3D NULL; @@ -1256,6 +1260,8 @@ static int qmp_chardev_open_socket_server(Chardev *ch= r, =20 qapi_free_SocketAddress(s->addr); s->addr =3D socket_local_address(s->listener->sioc[0]->fd, errp); + +skip_listen: update_disconnected_filename(s); =20 if (is_waitconnect) { @@ -1466,9 +1472,9 @@ static void qemu_chr_parse_socket(QemuOpts *opts, Cha= rdevBackend *backend, SocketAddressLegacy *addr; ChardevSocket *sock; =20 - if ((!!path + !!fd + !!host) !=3D 1) { + if ((!!path + !!fd + !!host) > 1) { error_setg(errp, - "Exactly one of 'path', 'fd' or 'host' required"); + "None or one of 'path', 'fd' or 'host' option required.= "); return; } =20 @@ -1542,12 +1548,10 @@ static void qemu_chr_parse_socket(QemuOpts *opts, C= hardevBackend *backend, .has_ipv6 =3D qemu_opt_get(opts, "ipv6"), .ipv6 =3D qemu_opt_get_bool(opts, "ipv6", 0), }; - } else if (fd) { + } else { addr->type =3D SOCKET_ADDRESS_TYPE_FD; addr->u.fd.data =3D g_new(String, 1); addr->u.fd.data->str =3D g_strdup(fd); - } else { - g_assert_not_reached(); } sock->addr =3D addr; } --=20 2.34.1.8.g35151cf07204