[Spice-devel] [spice-html5 v2] display: Only use display channel with id 0

[Jeremy White]

Also worked for me.

Acked-by: Jeremy White <jwhite at codeweavers.com>


On 07/17/2018 10:04 AM, Christophe Fergeau wrote:
> spice-html5 does not support multiple display channels, and will only
> use the first one offered by spice-server, and ignore the others. This
> can cause issues when using a VM with a configured but unused
> org.spice-space.stream.0 spice port as this will create a 'fake' display
> channel which is offered by spice-server before the usual qxl display
> channel.
> This commit favours the display channel with id 0 rather than picking
> the first one.
> 
> Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
> ---
>   main.js | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/main.js b/main.js
> index 173ff97..6976f9c 100644
> --- a/main.js
> +++ b/main.js
> @@ -146,10 +146,11 @@ SpiceMainConn.prototype.process_channel_message = function(msg)
>                       };
>               if (chans.channels[i].type == SPICE_CHANNEL_DISPLAY)
>               {
> -                if (this.display !== undefined)
> -                    this.log_warn("The spice-html5 client does not handle multiple heads.");
> -                else
> +                if (chans.channels[i].id == 0) {
>                       this.display = new SpiceDisplayConn(conn);
> +                } else {
> +                    this.log_warn("The spice-html5 client does not handle multiple heads.");
> +                }
>               }
>               else if (chans.channels[i].type == SPICE_CHANNEL_INPUTS)
>               {
>