[PATCH] server/console: ensure conhost has created the TTY input stream before waiting

Jacek Caban jacek at codeweavers.com
Fri Dec 17 09:10:48 CST 2021


Hi Eric,

On 12/15/21 10:46 AM, Eric Pouech wrote:
> +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry )
> +{
> +    struct console*console = (struct console*)obj;
> +    assert( obj->ops == &console_ops );
> +    /* before waiting, ensure conhost's input thread has been started */
> +    if (console->server && !console->server->once_input)
> +        queue_host_ioctl( console->server, IOCTL_CONDRV_PEEK, 0, NULL, NULL );


I think I mislead you, sorry about that. We still need to set once_input 
here because non-Unix consoles will never call IOCTL_CONDRV_SETUP_INPUT. 
And instead of setting it in IOCTL_CONDRV_SETUP_INPUT, we could simply 
add term_fd != -1 check here.


Other parts look good to me now.


Thanks,

Jacek




More information about the wine-devel mailing list