CP-17631: Don't use a default QEMU keymap

Until now we have been defaulting the keymap to `en-us` but this
prevents VNC clients from using the QEMU ExtendedKeyEvent extension for
passing raw scan codes.

If a keymap is not passed to QEMU, it will default to using `en-us`
anyway but will enable the ExtendedKeyEvent extension.

This does not change the behaviour for when a keymap has actually been
specified. In this case, it is still honoured and passed to QEMU with
the `-k` option.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>

Author: simonjbeaumont

xc/device.ml

@@ -1418,7 +1418,7 @@ type disp_intf_opt =
 (* Display output / keyboard input *)
 type disp_opt =
 	| NONE
-	| VNC of disp_intf_opt * string option * bool * int * string (* IP address, auto-allocate, port if previous false, keymap *)
+	| VNC of disp_intf_opt * string option * bool * int * string option (* IP address, auto-allocate, port if previous false, keymap *)
 	| SDL of disp_intf_opt * string (* X11 display *)
 
 type media = Disk | Cdrom
@@ -1537,12 +1537,11 @@ let cmdline_of_disp info =
 				"-vgt_low_gm_sz"; Int64.to_string gvt_g.low_gm_sz;
 				"-vgt_high_gm_sz"; Int64.to_string gvt_g.high_gm_sz;
 				"-vgt_fence_sz"; Int64.to_string gvt_g.fence_sz;
-			] in
-			let config_file_opt = match gvt_g.monitor_config_file with
+			]
+			and config_file_opt = match gvt_g.monitor_config_file with
 			| Some path -> Some ["-vgt_monitor_config_file"; path]
 			| None -> None
-			in
-			let priv_opt = Some ["-priv"] in
+			and priv_opt = Some ["-priv"] in
 			combine_opts [base_opts; config_file_opt; priv_opt]
 		| Vgpu _ -> failwith "Unsupported vGPU configuration"
 		| Std_vga -> ["-std-vga"]
@@ -1555,7 +1554,7 @@ let cmdline_of_disp info =
 		let port = if auto then "1" else string_of_int port in
 		let unused_opt = if auto then Some ["-vncunused"] else None in
 		let vnc_opt = Some ["-vnc"; ip_addr ^ ":" ^ port] in
-		let keymap_opt = Some ["-k"; keymap] in
+		let keymap_opt = Opt.map (fun keymap -> ["-k"; keymap]) keymap in
 		combine_opts [unused_opt; vnc_opt; keymap_opt]
 	in
 	let disp_options, wait_for_port =

xc/device.mli

@@ -178,7 +178,7 @@ sig
 
 	type disp_opt =
 		| NONE
-		| VNC of disp_intf_opt * string option * bool * int * string (* IP address, auto-allocate, port if previous false, keymap *)
+		| VNC of disp_intf_opt * string option * bool * int * string option (* IP address, auto-allocate, port if previous false, keymap *)
 		| SDL of disp_intf_opt * string (* X11 display *)
 
 	type media = Disk | Cdrom

xc/xenops_server_xen.ml

@@ -1102,7 +1102,7 @@ module VM = struct
 					?(nics=[]) ?(disks=[]) ?(vgpus=[])
 					?(pci_emulations=[]) ?(usb=Device.Dm.Disabled)
 					?(parallel=None)
-					?(acpi=true) ?(video=Cirrus) ?(keymap="en-us")
+					?(acpi=true) ?(video=Cirrus) ?keymap
 					?vnc_ip ?(pci_passthrough=false) ?(hvm=true) ?(video_mib=4) () =
 				let video = match video, vgpus with
 					| Cirrus, [] -> Device.Dm.Cirrus