Only export VNC over Unix sockets for upstream qemu

This special cases the change made by 4ca23db.

Signed-off-by: Si Beaumont <[email protected]>

Author: simonjbeaumont

xl/xenops_server_xenlight.ml

@@ -1955,7 +1955,17 @@ module VM = struct
 								b_info_hvm_default
 							| _ -> failwith "Expected HVM build_info here!"
 						in
-						let console_path = Printf.sprintf "unix:%s/%s" !Xl_path.vnc_dir vm.Vm.id in
+						let vnc_info =
+							let listen =
+								if !Xenopsd.use_upstream_qemu then
+									let console_path = Printf.sprintf "unix:%s/%s" !Xl_path.vnc_dir vm.Vm.id in
+									Some console_path
+								else None
+							in
+							let open Xenlight.Vnc_info in
+							let vnc_info_default = with_ctx (fun ctx -> default ctx ()) in
+							{ vnc_info_default with enable = Some true; listen = listen }
+						in
 						{ b_info_default with
 							ty = Hvm { b_info_hvm_default with
 								pae = Some true;
@@ -1964,7 +1974,7 @@ module VM = struct
 								nx = Some true;
 								timeoffset = Some hvm_info.Xenops_interface.Vm.timeoffset;
 								nested_hvm = Some true;
-								vnc = Xenlight.Vnc_info.({enable = Some true; listen = Some console_path; passwd = None; display = 0; findunused = None});
+								vnc = vnc_info;
 								keymap = hvm_info.Xenops_interface.Vm.keymap;
 								serial = hvm_info.Xenops_interface.Vm.serial;
 								boot = Some hvm_info.Xenops_interface.Vm.boot_order;