[Spice-devel] [PATCH xf86-video-qxl ] Set the regular spice port only once, and then only if it is not diabled.

[Jeremy White]

This fixes a bug where Xspice had to listen on two ports, even in an
SSL only configuration.

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 examples/spiceqxl.xorg.conf.example | 1 +
 src/spiceqxl_spice_server.c         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spiceqxl.xorg.conf.example b/examples/spiceqxl.xorg.conf.example
index 04fc437..ec6321e 100644
--- a/examples/spiceqxl.xorg.conf.example
+++ b/examples/spiceqxl.xorg.conf.example
@@ -4,6 +4,7 @@ Section "Device"
 
     # Enable regular port. Either this or SpiceTlsPort, or one of XSPICE_PORT or
     # XSPICE_TLS_PORT environment variables must be specified
+    # Specify 0 to disable the use of the regular port
     # default: 5900
     #Option "SpicePort" "5900"
 
diff --git a/src/spiceqxl_spice_server.c b/src/spiceqxl_spice_server.c
index 26e7487..b2b31ff 100644
--- a/src/spiceqxl_spice_server.c
+++ b/src/spiceqxl_spice_server.c
@@ -187,7 +187,6 @@ void xspice_set_spice_server_options(OptionInfoPtr options)
         exit(1);
     }
     printf("xspice: port = %d, tls_port = %d\n", port, tls_port);
-    spice_server_set_port(spice_server, port);
     if (disable_ticketing) {
         spice_server_set_noauth(spice_server);
     }
-- 
2.1.4