Re: [Qemu-trivial] [Qemu-devel] [PATCH v2 07/13] qemu-char: fix documentation for telnet+wait socket flags

[Markus Armbruster]

Gerd Hoffmann <address@hidden> writes:

> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  qapi-schema.json |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index a80ee40..a29ce57 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -3185,10 +3185,11 @@
>  # @addr: socket address to listen on (server=true)
>  #        or connect to (server=false)
>  # @server: #optional create server socket (default: true)
> -# @wait: #optional wait for connect (not used for server
> -#        sockets, default: false)
> +# @wait: #optional wait for incoming connection on server
> +#        sockets (default: false).
>  # @nodelay: #optional set TCP_NODELAY socket option (default: false)
> -# @telnet: #optional enable telnet protocol (default: false)
> +# @telnet: #optional enable telnet protocol on server
> +#          sockets (default: false)
>  #
>  # Since: 1.4
>  ##

Yes, both options apply only with server=true (I double-checked).

Curiously, qemu_chr_open_socket_fd() puts "telnet" into chr->filename
regardless of server.

qemu_chr_open_socket() has

    if (!is_listen)
        is_waitconnect = 0;

Should this perhaps be

    if (!is_listen) {
        is_waitconnect = 0;
        is_telnet = 0;
    }

?