display: Only use display channel with id 0

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@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Christophe Fergeau 2018-07-17 10:05:22 +02:00
parent 969fe1fb68
commit f9f700ee54

View File

@ -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)
{