[HFX-1841] CP-17631: Don't use a default QEMU keymap #290
Conversation
Xenopsd is responsible for sorting out the defaults and there's a good reason to leave it empty as it enables QEMU's ExtendedKeyEvent extension (see xenopsd#272). Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
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>
|
Needs review, Commit xapi-project/xenopsd@97f3c6d as part of xapi-project/xenopsd#272 not needed on cream. |
| (maybe_with_default [] (fun i -> ["-dom0-input"; string_of_int i]) x) | ||
| (maybe_with_default [] (fun i -> ["-dom0-input"; string_of_int i]) x) | ||
| in | ||
| let vnc_opts_of ip_addr_opt auto port keymap = |
There was a problem hiding this comment.
The naming of values is a bit inconsistent: the IP address and the keymap are both optional values but one has opt in its name and the other doesn't.
Independent of that I've tried to come up with more regular code but haven't found something that is vastly better.
There was a problem hiding this comment.
Since this is a backport, lets keep the commits and commit history intact as we have in trunk.
|
@lindig When you reviewed this, did you check that the code was backported correctly? |
|
I did not since I assumed these are cherry-picks. Will take a closer look. |
|
@lindig Thanks. Backports from post-Cream are slightly complicated cherry-picks, because repos and paths are changed. So it's good to verify this. |
|
Surprisingly, the original fix was in xenopds whereas these commits are in xapi. I believe the backport is faithful to the original. |
4 participants
No description provided.