From nobody Sun Sep 28 16:35:49 2025 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1758720854; cv=none; d=zohomail.com; s=zohoarc; b=i3YJHWkYbz8K6SD+YEtO/nfGimyn3AkDRNBE9JoYMEZqe/yzJX57eT4IxeqXa1vsfLXJ7EOuONYTZ0kjq0/UgHfph8tpRAuKYGn3f2K54ERdwY23cJfODkyIl693uqDQf6S8felSoxtOzbt8vK+HXmNBCW5fK2D50ucrKVNriA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758720854; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sdrF5tdB3xjrPNa6ut8UxL36Gu5ZirU/pnueFYWYoUY=; b=ExnvH9at8n9i4vL6KQ1nf+Pv6xdrPuKa+etPJk0++xAAmO7fUXEcvEiPbqyQLKVY8WuYwm0ibT6tcJagbjOZk6C0FZ/hhLAYGnfiQZ7ZW1u3s0/Y/AKiYxPvU9otWkiS2VP6B7OLfUzB26V1/tuOInTFl5bnhnL8S4mJ+vKq/Uc= 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 1758720854404300.1094765839995; Wed, 24 Sep 2025 06:34:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1Pcl-0004A3-Dz; Wed, 24 Sep 2025 09:33:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1Pce-00049H-TA for qemu-devel@nongnu.org; Wed, 24 Sep 2025 09:33:31 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v1PcT-00047a-Vt for qemu-devel@nongnu.org; Wed, 24 Sep 2025 09:33:28 -0400 Received: from mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:3a87:0:640:845c:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 4F62EC1025; Wed, 24 Sep 2025 16:33:13 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b6c::1:2c]) by mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id AXYn2X0FqeA0-DZShcip8; Wed, 24 Sep 2025 16:33:12 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1758720792; bh=sdrF5tdB3xjrPNa6ut8UxL36Gu5ZirU/pnueFYWYoUY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=zxtfxEJnoO6u5HsNcIdRfmoq33JmdrLXr8DFm2FKcFAidj/hNCSznyJqPDNtvNFNW 7nRc7Pm8Kco3baTgSv5je9kF9NRjdFbWOXYcitzarzoFdQ9oya5yXpKJF5yvAh+a42 qy9m2gHxBcUOFKjfpBpGPFdOwOSvKq6KHeopgOrE= Authentication-Results: mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: armbru@redhat.com Cc: qemu-devel@nongnu.org, eblake@redhat.com, jasowang@redhat.com, devel@lists.libvirt.org, pbonzini@redhat.com, marcandre.lureau@redhat.com, yc-core@yandex-team.ru, vsementsov@yandex-team.ru, d-tatianin@yandex-team.ru Subject: [PATCH v2 2/2] net/stream: remove deprecated 'reconnect' option Date: Wed, 24 Sep 2025 16:33:09 +0300 Message-ID: <20250924133309.334631-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250924133309.334631-1-vsementsov@yandex-team.ru> References: <20250924133309.334631-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1758720856810116601 Content-Type: text/plain; charset="utf-8" It was deprecated in 9.2, time to remove. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Daniil Tatianin --- docs/about/deprecated.rst | 9 --------- docs/about/removed-features.rst | 10 ++++++++++ net/stream.c | 20 +++++--------------- qapi/net.json | 13 +------------ 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ba0be97513..4452c08bf5 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -439,15 +439,6 @@ Backend ``memory`` (since 9.0) ``memory`` is a deprecated synonym for ``ringbuf``. =20 =20 -Net device options -'''''''''''''''''' - -Stream ``reconnect`` (since 9.2) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The ``reconnect`` option only allows specifying second granularity timeout= s, -which is not enough for all types of use cases, use ``reconnect-ms`` inste= ad. - CPU device properties ''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index d67928956a..ae7d7287fc 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1373,4 +1373,14 @@ Character device options The ``reconnect`` has been replaced by ``reconnect-ms``, which provides better precision. =20 +Net device options +'''''''''''''''''' + +Stream ``reconnect`` (removed in 10.2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``reconnect`` has been replaced by ``reconnect-ms``, which provides +better precision. + + .. _Intel discontinuance notification: https://www.intel.com/content/www/u= s/en/content-details/781327/intel-is-discontinuing-ip-ordering-codes-listed= -in-pdn2312-for-nios-ii-ip.html diff --git a/net/stream.c b/net/stream.c index 94f823a2a7..ea83f4a763 100644 --- a/net/stream.c +++ b/net/stream.c @@ -274,23 +274,13 @@ int net_init_stream(const Netdev *netdev, const char = *name, sock =3D &netdev->u.stream; =20 if (!sock->has_server || !sock->server) { - uint32_t reconnect_ms =3D 0; - - if (sock->has_reconnect && sock->has_reconnect_ms) { - error_setg(errp, "'reconnect' and 'reconnect-ms' are mutually " - "exclusive"); - return -1; - } else if (sock->has_reconnect_ms) { - reconnect_ms =3D sock->reconnect_ms; - } else if (sock->has_reconnect) { - reconnect_ms =3D sock->reconnect * 1000u; - } - return net_stream_client_init(peer, "stream", name, sock->addr, - reconnect_ms, errp); + sock->has_reconnect_ms ? + sock->reconnect_ms : 0, + errp); } - if (sock->has_reconnect || sock->has_reconnect_ms) { - error_setg(errp, "'reconnect' and 'reconnect-ms' options are " + if (sock->has_reconnect_ms) { + error_setg(errp, "'reconnect-ms' option is " "incompatible with socket in server mode"); return -1; } diff --git a/qapi/net.json b/qapi/net.json index 78bcc9871e..642d4d03cd 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -770,29 +770,18 @@ # # @server: create server socket (default: false) # -# @reconnect: For a client socket, if a socket is disconnected, then -# attempt a reconnect after the given number of seconds. Setting -# this to zero disables this function. (default: 0) (since 8.0) -# # @reconnect-ms: For a client socket, if a socket is disconnected, then # attempt a reconnect after the given number of milliseconds. Setting -# this to zero disables this function. This member is mutually -# exclusive with @reconnect. (default: 0) (Since: 9.2) +# this to zero disables this function. (default: 0) (Since: 9.2) # # Only `SocketAddress` types 'unix', 'inet' and 'fd' are supported. # -# Features: -# -# @deprecated: Member @reconnect is deprecated. Use @reconnect-ms -# instead. -# # Since: 7.2 ## { 'struct': 'NetdevStreamOptions', 'data': { 'addr': 'SocketAddress', '*server': 'bool', - '*reconnect': { 'type': 'int', 'features': [ 'deprecated' ] }, '*reconnect-ms': 'int' } } =20 ## --=20 2.48.1