From nobody Sun Feb 8 16:31:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616059771; cv=none; d=zohomail.com; s=zohoarc; b=Kji0o6w4wUIEgF5L1b3Qbf0ecPq0CO+LwbHBiPxPXzp9SnMQTug+S4Mgy1fPMnGIB7ASAAJh+tt6Niv3ZgHujQD1Hg/Ff3oui73E+LGRd5B9flsZO/5xYkoWCLQfvxdFzvKOwoJHDfGbnTUwFNyjAHQcs0FDZn0qXQdCPKpu1n8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616059771; 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=RRYBQdiX1pqGnR6U9LZYWnPiWUlqKskLG2dpMCl968w=; b=HWGgGvB6/AnKeCcYII2baM13/3i4y68NffkW+nAgIoFcYmenCCiwzqx3X23g/4oH2vUuz2njPNeenu2VxKjfh9QIPBHtTGL32ZEqgiIUtZo9SatGSSbqymAHbPkROD1s1gcsdXy/ukXdZbfPkSnlMgLW6gnbZw7V3TqEUs5UoYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616059771606692.4477876333004; Thu, 18 Mar 2021 02:29:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-36-gBZbOQvNPoSEU98NfQALTA-1; Thu, 18 Mar 2021 05:29:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FCC2107B7CB; Thu, 18 Mar 2021 09:29:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB9725B4A0; Thu, 18 Mar 2021 09:29:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9450A4BB7C; Thu, 18 Mar 2021 09:29:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I9TLGt006591 for ; Thu, 18 Mar 2021 05:29:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C78B63634; Thu, 18 Mar 2021 09:29:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-61.ams2.redhat.com [10.36.115.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FFE76A8E4; Thu, 18 Mar 2021 09:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616059770; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=RRYBQdiX1pqGnR6U9LZYWnPiWUlqKskLG2dpMCl968w=; b=B2x9FzAOmMs71xosUTQnJc7WH/QkNGccQrORQdbJWS4ABwpIMd+v8l1qQPb4x13Ou1DKux qS7tKBuL5wAvpQG9TToEBR4290KtQz3wRu9lTGi2YO0Onwvg8NNdvmb647R44AxWW0YUso oRQVcgRvnYs8qHkmtLR2ApViGza8Qmk= X-MC-Unique: gBZbOQvNPoSEU98NfQALTA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/13] chardev: reject use of 'wait' flag for socket client chardevs Date: Thu, 18 Mar 2021 09:25:06 +0000 Message-Id: <20210318092512.250725-8-berrange@redhat.com> In-Reply-To: <20210318092512.250725-1-berrange@redhat.com> References: <20210318092512.250725-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Fam Zheng , "Michael S. Tsirkin" , libvir-list@redhat.com, Mark Cave-Ayland , Gerd Hoffmann , qemu-block@nongnu.org, Juan Quintela , Wainer dos Santos Moschetta , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Greg Kurz , Cleber Rosa , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Max Reitz , qemu-ppc@nongnu.org, Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This only makes sense conceptually when used with listener chardevs. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Daniel P. Berrang=C3=A9 --- chardev/char-socket.c | 12 ++++-------- docs/system/deprecated.rst | 6 ------ docs/system/removed-features.rst | 6 ++++++ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index c8bced76b7..f618bdec28 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1339,14 +1339,10 @@ static bool qmp_chardev_validate_socket(ChardevSock= et *sock, return false; } if (sock->has_wait) { - warn_report("'wait' option is deprecated with " - "socket in client connect mode"); - if (sock->wait) { - error_setg(errp, "%s", - "'wait' option is incompatible with " - "socket in client connect mode"); - return false; - } + error_setg(errp, "%s", + "'wait' option is incompatible with " + "socket in client connect mode"); + return false; } } =20 diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 30c5969e22..eed35fd004 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -228,12 +228,6 @@ Since the ``dirty-bitmaps`` field is optionally presen= t in both the old and new locations, clients must use introspection to learn where to anticipate the field if/when it does appear in command output. =20 -chardev client socket with ``wait`` option (since 4.0) -'''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Character devices creating sockets in client mode should not specify -the 'wait' field, which is only applicable to sockets in server mode - ``nbd-server-add`` and ``nbd-server-remove`` (since 5.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index ce1087c6a7..33b8c08f9b 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -104,6 +104,12 @@ The ``query-cpus`` command is replaced by the ``query-= cpus-fast`` command. The ``arch`` output member of the ``query-cpus-fast`` command is replaced by the ``target`` output member. =20 +chardev client socket with ``wait`` option (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Character devices creating sockets in client mode should not specify +the 'wait' field, which is only applicable to sockets in server mode + Human Monitor Protocol (HMP) commands ------------------------------------- =20 --=20 2.30.2