From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Thu, 30 Jul 2009 18:11:53 +0000 (+0100)
Subject: fix vnc specification in qemu call to include the bind address
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=976279d2b6a769b362b6e564def38fbb6bf1b37a;p=xenclient%2Ftoolstack.git

fix vnc specification in qemu call to include the bind address
---

diff --git a/xenops/device.ml b/xenops/device.ml
index fbb2214..deb7cba 100644
--- a/xenops/device.ml
+++ b/xenops/device.ml
@@ -1085,7 +1085,7 @@ module Dm = struct
 
 type disp_opt =
 	| NONE
-	| VNC of bool * int * string (* auto-allocate, port if previous false, keymap *)
+	| VNC of bool * string * int * string (* auto-allocate, bind address could be empty, port if auto-allocate false, keymap *)
 	| SDL of string (* X11 display *)
 
 type info = {
@@ -1187,10 +1187,10 @@ let __start ~xs ~dmpath ~restore ?(timeout=qemu_dm_ready_timeout) info domid =
 		match info.disp with
 		| NONE                     -> [], false
 		| SDL (x11name)            -> [], false
-		| VNC (auto, port, keymap) ->
+		| VNC (auto, bindaddr, port, keymap) ->
 			if auto
 			then [ "-vncunused"; "-k"; keymap ], true
-			else [ "-vnc"; string_of_int port; "-k"; keymap ], true
+			else [ "-vnc"; bindaddr ^ ":" ^ string_of_int port; "-k"; keymap ], true
 		in
 	let sound_options =
 		match info.sound with
diff --git a/xenops/device.mli b/xenops/device.mli
index d41287e..461496c 100644
--- a/xenops/device.mli
+++ b/xenops/device.mli
@@ -146,7 +146,7 @@ module Dm :
 sig
 	type disp_opt =
 		| NONE
-		| VNC of bool * int * string (* auto-allocate, port if previous false, keymap *)
+		| VNC of bool * string * int * string (* auto-allocate, bind address, port it !autoallocate, keymap *)
 		| SDL of string (* X11 display *)
 
 	type info = {
diff --git a/xenvm/vmact.ml b/xenvm/vmact.ml
index 9dd769b..786c514 100644
--- a/xenvm/vmact.ml
+++ b/xenvm/vmact.ml
@@ -188,8 +188,8 @@ let dm_info_of_cfg cfg =
 	let disp =
 		match cfg.vnc with
 		| (-1) -> Device.Dm.NONE
-		| 0    -> Device.Dm.VNC (true, 0, cfg.vnc_keymap)
-		| _    -> Device.Dm.VNC (false, cfg.vnc, cfg.vnc_keymap)
+		| 0    -> Device.Dm.VNC (true, "", 0, cfg.vnc_keymap)
+		| _    -> Device.Dm.VNC (false, "", cfg.vnc, cfg.vnc_keymap)
 		in
 	{
 		Device.Dm.hvm = cfg.hvm;