コミット: a52e6fbbd4512a54c78da64df4c065913c6f7f7d - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

コミットメタ情報

• リビジョン: a52e6fbbd4512a54c78da64df4c065913c6f7f7d (tree)
• 日時: 2021-01-02 13:42:09
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

kbdlayout: add patch for FreeBSD 12.2-RELEASE
kbdlayout: rebase for FreeBSE 13.0-current(20201224)
qemuextkey: add patch for FreeBSD 12.2-RELEASE
qemuextkey: rebase for FreeBSE 13.0-current(20201224)

変更サマリ

• add: kbdlayout_option/bhyve_kbdlayout_option_fbsd122r.patch
• modified: kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
• add: kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd122r.patch
• modified: kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13c.patch
• add: qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd122r.patch
• modified: qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch

差分

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd122r.patch
@@ -0,0 +1,248 @@
+diff -uprN bhyve_orig/Makefile bhyve/Makefile
+--- bhyve_orig/Makefile	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/Makefile	2020-12-30 15:37:58.795173000 +0900
+@@ -95,4 +95,6 @@ CFLAGS+=-DGDB_LOG
+ 
+ WARNS?=	2
+ 
++SUBDIR=	kbdlayout
++
+ .include <bsd.prog.mk>
+diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
+--- bhyve_orig/bhyve.8	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/bhyve.8	2020-12-30 15:37:58.795903000 +0900
+@@ -47,6 +47,7 @@
+ .Sm on
+ .Op Fl G Ar port
+ .Op Fl g Ar gdbport
++.Op Fl k Ar layout
+ .Oo Fl l
+ .Sm off
+ .Cm help | Ar lpcdev Op Cm \&, Ar conf
+@@ -163,6 +164,13 @@ Print help message and exit.
+ .It Fl H
+ Yield the virtual CPU thread when a HLT instruction is detected.
+ If this option is not specified, virtual CPUs will use 100% of a host CPU.
++.It Fl k Ar layout
++Specify the keyboard layout.
++The value that can be specified sets the file name in
++.Ar /usr/share/bhyve/kbdlayout .
++This specification only works when loaded with UEFI mode.(Not working via console or SSH)
++If you are using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), don't need to specify this option.
++If you are using a VNC client that doesn't support it(e.g. tightVNC), and you don't specify this option, the US keyboard layout(default) is specified.
+ .It Fl l Op Ar help|lpcdev Ns Op , Ns Ar conf
+ Allow devices behind the LPC PCI-ISA bridge to be configured.
+ The only supported devices are the TTY-class devices
+diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
+--- bhyve_orig/bhyverun.c	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/bhyverun.c	2020-12-30 15:37:58.796864000 +0900
+@@ -165,6 +165,8 @@ char *vmname;
+ int guest_ncpus;
+ uint16_t cores, maxcpus, sockets, threads;
+ 
++char *kbdlayout_name;
++
+ char *guest_uuid_str;
+ 
+ int raw_stdio = 0;
+@@ -215,7 +217,7 @@ usage(int code)
+         fprintf(stderr,
+ 		"Usage: %s [-abehuwxACDHPSWY]\n"
+ 		"       %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"
+-		"       %*s [-g <gdb port>] [-l <lpc>]\n"
++		"       %*s [-g <gdb port>] [-k layout] [-l <lpc>]\n"
+ 		"       %*s [-m mem] [-p vcpu:hostcpu] [-s <pci>] [-U uuid] <vm>\n"
+ 		"       -a: local apic is in xAPIC mode (deprecated)\n"
+ 		"       -A: create ACPI tables\n"
+@@ -226,6 +228,7 @@ usage(int code)
+ 		"       -g: gdb port\n"
+ 		"       -h: help\n"
+ 		"       -H: vmexit from the guest on hlt\n"
++		"       -k: PS2 keyboard layout\n"
+ 		"       -l: LPC device configuration\n"
+ 		"       -m: memory size in MB\n"
+ 		"       -p: pin 'vcpu' to 'hostcpu'\n"
+@@ -1024,8 +1027,9 @@ main(int argc, char *argv[])
+ 	mptgen = 1;
+ 	rtc_localtime = 1;
+ 	memflags = 0;
++	kbdlayout_name = NULL;
+ 
+-	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:";
++	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:";
+ 	while ((c = getopt(argc, argv, optstr)) != -1) {
+ 		switch (c) {
+ 		case 'a':
+@@ -1064,6 +1068,9 @@ main(int argc, char *argv[])
+ 				optarg++;
+ 			}
+ 			gdb_port = atoi(optarg);
++			break;
++		case 'k':
++			kbdlayout_name = optarg;
+ 			break;
+ 		case 'l':
+ 			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
+diff -uprN bhyve_orig/bhyverun.h bhyve/bhyverun.h
+--- bhyve_orig/bhyverun.h	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/bhyverun.h	2020-12-30 15:37:58.797234000 +0900
+@@ -39,6 +39,7 @@ extern int guest_ncpus;
+ extern uint16_t cores, sockets, threads;
+ extern char *guest_uuid_str;
+ extern char *vmname;
++extern char *kbdlayout_name;
+ 
+ void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
+ 
+diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
+--- bhyve_orig/ps2kbd.c	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/ps2kbd.c	2020-12-30 15:37:58.797949000 +0900
+@@ -31,15 +31,20 @@
+ __FBSDID("$FreeBSD: releng/12.2/usr.sbin/bhyve/ps2kbd.c 358184 2020-02-20 21:48:36Z vmaffione $");
+ 
+ #include <sys/types.h>
++#include <sys/stat.h>
+ 
+ #include <assert.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <strings.h>
+ #include <pthread.h>
+ #include <pthread_np.h>
++#include <unistd.h>
++#include <fcntl.h>
+ 
++#include "bhyverun.h"
+ #include "atkbdc.h"
+ #include "debug.h"
+ #include "console.h"
+@@ -59,6 +64,8 @@ __FBSDID("$FreeBSD: releng/12.2/usr.sbin/bhyve/ps2kbd.
+ 
+ #define	PS2KBD_FIFOSZ		16
+ 
++#define PS2KBD_LAYOUT_BASEDIR	"/usr/share/bhyve/kbdlayout/"
++
+ struct fifo {
+ 	uint8_t	buf[PS2KBD_FIFOSZ];
+ 	int	rindex;		/* index to read from */
+@@ -87,7 +94,7 @@ struct extended_translation {
+ /*
+  * FIXME: Pause/break and Print Screen/SysRq require special handling.
+  */
+-static const struct extended_translation extended_translations[] = {
++static struct extended_translation extended_translations[128] = {
+ 		{0xff08, 0x66},		/* Back space */
+ 		{0xff09, 0x0d},		/* Tab */
+ 		{0xff0d, 0x5a},		/* Return */
+@@ -159,7 +166,7 @@ static const struct extended_translation extended_tran
+ };
+ 
+ /* ASCII to type 2 scancode lookup table */
+-static const uint8_t ascii_translations[128] = {
++static uint8_t ascii_translations[128] = {
+ 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+@@ -317,7 +324,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+ 	assert(pthread_mutex_isowned_np(&sc->mtx));
+ 	int e0_prefix, found;
+ 	uint8_t code;
+-	const struct extended_translation *trans;
++	struct extended_translation *trans;
+ 
+ 	found = 0;
+ 	if (keysym < 0x80) {
+@@ -367,10 +374,91 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+ 		atkbdc_event(sc->atkbdc_sc, 1);
+ }
+ 
++static void
++ps2kbd_update_extended_translation(uint32_t keycode, uint32_t scancode, uint32_t prefix)
++{
++	int i = 0;
++
++	do	{
++		if (extended_translations[i].keysym == keycode)
++			break;
++	} while(extended_translations[++i].keysym);
++
++	if (i == (sizeof(extended_translations) / sizeof(struct extended_translation) - 1))
++		return;
++
++	if (!extended_translations[i].keysym)	{
++		extended_translations[i].keysym = keycode;
++
++		extended_translations[i+1].keysym = 0;
++		extended_translations[i+1].scancode = 0;
++		extended_translations[i+1].flags = 0;
++	}
++
++	extended_translations[i].scancode = (uint8_t)(scancode & 0xff);
++	extended_translations[i].flags = (prefix ? SCANCODE_E0_PREFIX : 0);
++}
++
++static void
++ps2kbd_setkbdlayout(void)
++{
++	int err;
++	int fd;
++	char path[256];
++	char *buf, *next, *line;
++	struct stat sb;
++	size_t sz;
++	uint8_t ascii;
++	uint32_t keycode, scancode, prefix;
++
++	strcpy(path, PS2KBD_LAYOUT_BASEDIR);
++	strncat(path, kbdlayout_name, (sizeof(path) - strlen(PS2KBD_LAYOUT_BASEDIR) - 1));
++
++	err = stat(path, &sb);
++	if (err)
++		return;
++
++	buf = (char *)malloc(sizeof(char) * sb.st_size);
++	if (buf == NULL)
++		return;
++
++	fd = open(path, O_RDONLY);
++	if (fd == -1)
++		goto out;
++
++	sz = read(fd, buf, sb.st_size );
++
++	close(fd);
++
++	if (sz != sb.st_size )
++		goto out;
++
++	next = buf;
++	while ((line = strsep(&next, "\n")) != NULL)	{
++		if (sscanf(line, "'%c',%x;", &ascii, &scancode) == 2)	{
++			if (ascii < 0x80)
++				ascii_translations[ascii] = (uint8_t)(scancode & 0xff);
++		} else if (sscanf(line, "%x,%x,%x;", &keycode, &scancode, &prefix) == 3 )	{
++			ps2kbd_update_extended_translation(keycode, scancode, prefix);
++		} else if (sscanf(line, "%x,%x;", &keycode, &scancode) == 2)	{
++			if (keycode < 0x80)
++				ascii_translations[(uint8_t)(keycode & 0xff)] = (uint8_t)(scancode & 0xff);
++			else
++				ps2kbd_update_extended_translation(keycode, scancode, 0);
++		}
++	}
++
++out:
++	free(buf);
++}
++
+ struct ps2kbd_softc *
+ ps2kbd_init(struct atkbdc_softc *atkbdc_sc)
+ {
+ 	struct ps2kbd_softc *sc;
++
++	if (kbdlayout_name != NULL)
++		ps2kbd_setkbdlayout();
+ 
+ 	sc = calloc(1, sizeof (struct ps2kbd_softc));
+ 	pthread_mutex_init(&sc->mtx, NULL);

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
@@ -1,16 +1,16 @@
-diff -upN bhyve_base/Makefile bhyve/Makefile
---- bhyve_base/Makefile	2020-06-14 16:06:21.223455000 +0900
-+++ bhyve/Makefile	2020-06-14 16:12:32.408499000 +0900
-@@ -121,4 +121,6 @@ CFLAGS+=-DGDB_LOG
+diff -uprN bhyve_orig/Makefile bhyve/Makefile
+--- bhyve_orig/Makefile	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/Makefile	2020-12-30 21:29:03.796383000 +0900
+@@ -124,4 +124,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
  
 +SUBDIR=	kbdlayout
 +
  .include <bsd.prog.mk>
-diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
---- bhyve_base/bhyve.8	2020-06-14 16:06:21.236090000 +0900
-+++ bhyve/bhyve.8	2020-06-14 16:12:32.409488000 +0900
+diff -uprN bhyve_orig/bhyve.8 bhyve/bhyve.8
+--- bhyve_orig/bhyve.8	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/bhyve.8	2020-12-30 21:24:17.882128000 +0900
 @@ -47,6 +47,7 @@
  .Sm on
  .Op Fl G Ar port
@@ -19,7 +19,7 @@ diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
  .Oo Fl l
  .Sm off
  .Cm help | Ar lpcdev Op Cm \&, Ar conf
-@@ -162,6 +163,13 @@ Print help message and exit.
+@@ -166,6 +167,13 @@ Print help message and exit.
  .It Fl H
  Yield the virtual CPU thread when a HLT instruction is detected.
  If this option is not specified, virtual CPUs will use 100% of a host CPU.
@@ -33,10 +33,10 @@ diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
  .It Fl l Op Ar help|lpcdev Ns Op , Ns Ar conf
  Allow devices behind the LPC PCI-ISA bridge to be configured.
  The only supported devices are the TTY-class devices
-diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
---- bhyve_base/bhyverun.c	2020-06-14 16:06:21.267122000 +0900
-+++ bhyve/bhyverun.c	2020-06-14 16:12:32.410678000 +0900
-@@ -188,6 +188,8 @@ const char *vmname;
+diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
+--- bhyve_orig/bhyverun.c	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/bhyverun.c	2020-12-30 21:26:48.192087000 +0900
+@@ -189,6 +189,8 @@ const char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
  
@@ -45,16 +45,16 @@ diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
  char *guest_uuid_str;
  
  int raw_stdio = 0;
-@@ -237,7 +239,7 @@ usage(int code)
+@@ -239,7 +241,7 @@ usage(int code)
          fprintf(stderr,
- 		"Usage: %s [-abehuwxACHPSWY]\n"
+ 		"Usage: %s [-abehuwxACDHPSWY]\n"
  		"       %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"
 -		"       %*s [-g <gdb port>] [-l <lpc>]\n"
 +		"       %*s [-g <gdb port>] [-k layout] [-l <lpc>]\n"
  		"       %*s [-m mem] [-p vcpu:hostcpu] [-s <pci>] [-U uuid] <vm>\n"
  		"       -a: local apic is in xAPIC mode (deprecated)\n"
  		"       -A: create ACPI tables\n"
-@@ -247,6 +249,7 @@ usage(int code)
+@@ -250,6 +252,7 @@ usage(int code)
  		"       -g: gdb port\n"
  		"       -h: help\n"
  		"       -H: vmexit from the guest on hlt\n"
@@ -62,22 +62,22 @@ diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
  		"       -l: LPC device configuration\n"
  		"       -m: memory size in MB\n"
  #ifdef BHYVE_SNAPSHOT
-@@ -1084,11 +1087,12 @@ main(int argc, char *argv[])
+@@ -1109,11 +1112,12 @@ main(int argc, char *argv[])
  	mptgen = 1;
  	rtc_localtime = 1;
  	memflags = 0;
 +	kbdlayout_name = NULL;
  
  #ifdef BHYVE_SNAPSHOT
--	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:r:";
-+	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:k:U:r:";
+-	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:r:";
++	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:r:";
  #else
--	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:";
-+	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:k:U:";
+-	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:";
++	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:";
  #endif
  	while ((c = getopt(argc, argv, optstr)) != -1) {
  		switch (c) {
-@@ -1125,6 +1129,9 @@ main(int argc, char *argv[])
+@@ -1155,6 +1159,9 @@ main(int argc, char *argv[])
  				optarg++;
  			}
  			gdb_port = atoi(optarg);
@@ -87,9 +87,9 @@ diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
  			break;
  		case 'l':
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
-diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
---- bhyve_base/bhyverun.h	2020-06-14 16:06:21.236876000 +0900
-+++ bhyve/bhyverun.h	2020-06-14 16:12:32.410831000 +0900
+diff -uprN bhyve_orig/bhyverun.h bhyve/bhyverun.h
+--- bhyve_orig/bhyverun.h	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/bhyverun.h	2020-12-30 21:24:17.885813000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -98,19 +98,18 @@ diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
  
  void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
  #ifdef BHYVE_SNAPSHOT
-Common subdirectories: bhyve_base/kbdlayout and bhyve/kbdlayout
-diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_base/ps2kbd.c	2020-06-14 16:06:49.476779000 +0900
-+++ bhyve/ps2kbd.c	2020-06-14 16:12:32.411172000 +0900
+diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
+--- bhyve_orig/ps2kbd.c	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/ps2kbd.c	2020-12-30 21:24:17.887408000 +0900
 @@ -31,6 +31,7 @@
- __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 360648 2020-05-05 00:02:04Z jhb $");
+ __FBSDID("$FreeBSD$");
  
  #include <sys/types.h>
 +#include <sys/stat.h>
  
  #include <machine/vmm_snapshot.h>
  
-@@ -42,7 +43,10 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 36064
+@@ -42,7 +43,10 @@ __FBSDID("$FreeBSD$");
  #include <strings.h>
  #include <pthread.h>
  #include <pthread_np.h>
@@ -121,7 +120,7 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  #include "atkbdc.h"
  #include "debug.h"
  #include "console.h"
-@@ -62,6 +66,8 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 36064
+@@ -62,6 +66,8 @@ __FBSDID("$FreeBSD$");
  
  #define	PS2KBD_FIFOSZ		16
  
@@ -148,16 +147,16 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-@@ -340,7 +346,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -320,7 +326,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
 -	const struct extended_translation *trans;
 +	struct extended_translation *trans;
  
- 	if (keycode) {
- 		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
-@@ -396,10 +402,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
+ 	found = 0;
+ 	if (keysym < 0x80) {
+@@ -370,10 +376,91 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
  		atkbdc_event(sc->atkbdc_sc, 1);
  }
  

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd122r.patch
@@ -0,0 +1,41 @@
+diff -uprN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
+--- examples/bhyve_orig/vmrun.sh	2020-10-23 09:02:33.000000000 +0900
++++ examples/bhyve/vmrun.sh	2020-12-30 16:07:31.585188000 +0900
+@@ -59,8 +59,8 @@ usage() {
+ 	echo "                [-e <name=value>] [-f <path of firmware>]" \
+ 	    "[-F <size>]"
+ 	echo "                [-g <gdbport> ] [-H <directory>]"
+-	echo "                [-I <location of installation iso>] [-l <loader>]"
+-	echo "                [-L <VNC IP for UEFI framebuffer>]"
++	echo "                [-I <location of installation iso>] [-k <layout>]"
++	echo "                [-l <loader>] [-L <VNC IP for UEFI framebuffer>]"
+ 	echo "                [-m <memsize>]" \
+ 	    "[-n <network adapter emulation type>]"
+ 	echo "                [-P <port>] [-t <tapdev>] <vmname>"
+@@ -81,6 +81,7 @@ usage() {
+ 	echo "       -i: force boot of the Installation CDROM image"
+ 	echo "       -I: Installation CDROM image location" \
+ 	    "(default: ${DEFAULT_ISOFILE})"
++	echo "       -k: Specify the keyboard layout"
+ 	echo "       -l: the OS loader to use (default: /boot/userboot.so)"
+ 	echo "       -L: IP address for UEFI GOP VNC server" \
+ 	    "(default: ${DEFAULT_VNCHOST}"
+@@ -134,7 +135,7 @@ vncport=${DEFAULT_VNCPORT}
+ vncsize=${DEFAULT_VNCSIZE}
+ tablet=""
+ 
+-while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:L:m:n:p:P:t:Tuvw c ; do
++while getopts aAc:C:d:e:Ef:F:g:hH:iI:k:l:L:m:n:p:P:t:Tuvw c ; do
+ 	case $c in
+ 	a)
+ 		bhyverun_opt="${bhyverun_opt} -a"
+@@ -178,6 +179,9 @@ while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:L:m:n:p:P:t:Tuv
+ 		;;
+ 	I)
+ 		isofile=${OPTARG}
++		;;
++	k)
++		bhyverun_opt="${bhyverun_opt} -k ${OPTARG}"
+ 		;;
+ 	l)
+ 		loader_opt="${loader_opt} -l ${OPTARG}"

--- a/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13c.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13c.patch
@@ -1,6 +1,6 @@
-diff -upN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
---- examples/bhyve_orig/vmrun.sh	2020-05-28 09:02:55.000000000 +0900
-+++ examples/bhyve/vmrun.sh	2020-06-03 19:37:56.271282000 +0900
+diff -uprN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
+--- examples/bhyve_orig/vmrun.sh	2020-12-24 09:12:29.000000000 +0900
++++ examples/bhyve/vmrun.sh	2020-12-30 21:48:02.559191000 +0900
 @@ -59,8 +59,8 @@ usage() {
  	echo "                [-e <name=value>] [-f <path of firmware>]" \
  	    "[-F <size>]"

--- /dev/null
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd122r.patch
@@ -0,0 +1,271 @@
+diff -uprN bhyve_orig/console.c bhyve/console.c
+--- bhyve_orig/console.c	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/console.c	2020-12-30 18:21:24.579446000 +0900
+@@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
+ }
+ 
+ void
+-console_key_event(int down, uint32_t keysym)
++console_key_event(int down, uint32_t keysym, uint32_t keycode)
+ {
+ 	if (console.kbd_event_cb)
+-		(*console.kbd_event_cb)(down, keysym, console.kbd_arg);
++		(*console.kbd_event_cb)(down, keysym, keycode, console.kbd_arg);
+ }
+ 
+ void
+diff -uprN bhyve_orig/console.h bhyve/console.h
+--- bhyve_orig/console.h	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/console.h	2020-12-30 18:21:24.579887000 +0900
+@@ -34,7 +34,7 @@
+ struct bhyvegc;
+ 
+ typedef void (*fb_render_func_t)(struct bhyvegc *gc, void *arg);
+-typedef void (*kbd_event_func_t)(int down, uint32_t keysym, void *arg);
++typedef void (*kbd_event_func_t)(int down, uint32_t keysym, uint32_t keycode, void *arg);
+ typedef void (*ptr_event_func_t)(uint8_t mask, int x, int y, void *arg);
+ 
+ void console_init(int w, int h, void *fbaddr);
+@@ -47,7 +47,7 @@ void console_fb_register(fb_render_func_t render_cb, v
+ void console_refresh(void);
+ 
+ void console_kbd_register(kbd_event_func_t event_cb, void *arg, int pri);
+-void console_key_event(int down, uint32_t keysym);
++void console_key_event(int down, uint32_t keysym, uint32_t keycode);
+ 
+ void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
+ void console_ptr_event(uint8_t button, int x, int y);
+diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
+--- bhyve_orig/ps2kbd.c	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/ps2kbd.c	2020-12-30 18:21:24.580562000 +0900
+@@ -178,6 +178,26 @@ static const uint8_t ascii_translations[128] = {
+ 		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
+ };
+ 
++/* ScanCode set1 to set2 lookup table */
++const uint8_t keyset1to2_translations[128] = {
++		   0, 0x76, 0x16, 0x1E, 0x26, 0x25, 0x2e, 0x36,
++		0x3d, 0x3e, 0x46, 0x45, 0x4e, 0x55, 0x66, 0x0d,
++		0x15, 0x1d, 0x24, 0x2d, 0x2c, 0x35, 0x3c, 0x43,
++		0x44, 0x4d, 0x54, 0x5b, 0x5a, 0x14, 0x1c, 0x1b,
++		0x23, 0x2b, 0x34, 0x33, 0x3b, 0x42, 0x4b, 0x4c,
++		0x52, 0x0e, 0x12, 0x5d, 0x1a, 0x22, 0x21, 0x2a,
++		0x32, 0x31, 0x3a, 0x41, 0x49, 0x4a, 0x59, 0x7c,
++		0x11, 0x29, 0x58, 0x05, 0x06, 0x04, 0x0c, 0x03,
++		0x0b, 0x83, 0x0a, 0x01, 0x09, 0x77, 0x7e, 0x6c,
++		0x75, 0x7d, 0x7b, 0x6b, 0x73, 0x74, 0x79, 0x69,
++		0x72, 0x7a, 0x70, 0x71, 0x84, 0x60, 0x61, 0x78,
++		0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37, 0x3f,
++		0x47, 0x4f, 0x56, 0x5e, 0x08, 0x10, 0x18, 0x20,
++		0x28, 0x30, 0x38, 0x40, 0x48, 0x50, 0x57, 0x6f,
++		0x13, 0x19, 0x39, 0x51, 0x53, 0x5c, 0x5f, 0x62,
++		0x63, 0x64, 0x65, 0x67, 0x68, 0x6a, 0x6d, 0x6e,
++};
++
+ static void
+ fifo_init(struct ps2kbd_softc *sc)
+ {
+@@ -312,26 +332,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+  */
+ static void
+ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+-    int down, uint32_t keysym)
++    int down, uint32_t keysym, uint32_t keycode)
+ {
+ 	assert(pthread_mutex_isowned_np(&sc->mtx));
+ 	int e0_prefix, found;
+ 	uint8_t code;
+ 	const struct extended_translation *trans;
+ 
+-	found = 0;
+-	if (keysym < 0x80) {
+-		code = ascii_translations[keysym];
+-		e0_prefix = 0;
++	if (keycode) {
++		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
++		e0_prefix = ((keycode & 0x80) ?  SCANCODE_E0_PREFIX : 0);
+ 		found = 1;
+ 	} else {
+-		for (trans = &(extended_translations[0]); trans->keysym != 0;
+-		    trans++) {
+-			if (keysym == trans->keysym) {
+-				code = trans->scancode;
+-				e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
+-				found = 1;
+-				break;
++		found = 0;
++		if (keysym < 0x80) {
++			code = ascii_translations[keysym];
++			e0_prefix = 0;
++			found = 1;
++		} else {
++			for (trans = &(extended_translations[0]); trans->keysym != 0;
++		    	trans++) {
++				if (keysym == trans->keysym) {
++					code = trans->scancode;
++					e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
++					found = 1;
++					break;
++				}
+ 			}
+ 		}
+ 	}
+@@ -349,7 +375,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+ }
+ 
+ static void
+-ps2kbd_event(int down, uint32_t keysym, void *arg)
++ps2kbd_event(int down, uint32_t keysym, uint32_t keycode, void *arg)
+ {
+ 	struct ps2kbd_softc *sc = arg;
+ 	int fifo_full;
+@@ -360,7 +386,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+ 		return;
+ 	}
+ 	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
+-	ps2kbd_keysym_queue(sc, down, keysym);
++	ps2kbd_keysym_queue(sc, down, keysym, keycode);
+ 	pthread_mutex_unlock(&sc->mtx);
+ 
+ 	if (!fifo_full)
+diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
+--- bhyve_orig/rfb.c	2020-10-23 09:02:29.000000000 +0900
++++ bhyve/rfb.c	2020-12-30 18:21:24.581683000 +0900
+@@ -99,7 +99,10 @@ struct rfb_softc {
+ 	bool	enc_raw_ok;
+ 	bool	enc_zlib_ok;
+ 	bool	enc_resize_ok;
++	bool	enc_extkeyevent_ok;
+ 
++	bool	enc_extkeyevent_send;
++
+ 	z_stream	zstream;
+ 	uint8_t		*zbuf;
+ 	int		zbuflen;
+@@ -145,7 +148,10 @@ struct rfb_pixfmt_msg {
+ #define	RFB_ENCODING_RAW		0
+ #define	RFB_ENCODING_ZLIB		6
+ #define	RFB_ENCODING_RESIZE		-223
++#define	RFB_ENCODING_EXT_KEYEVENT	-258
+ 
++#define	RFB_CLIENTMSG_EXT_KEYEVENT	0
++
+ #define	RFB_MAX_WIDTH			2000
+ #define	RFB_MAX_HEIGHT			1200
+ #define	RFB_ZLIB_BUFSZ			RFB_MAX_WIDTH*RFB_MAX_HEIGHT*4
+@@ -172,6 +178,19 @@ struct rfb_key_msg {
+ 	uint8_t		type;
+ 	uint8_t		down;
+ 	uint16_t	pad;
++	uint32_t	sym;
++};
++
++struct rfb_client_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++};
++
++struct rfb_extended_key_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++	uint16_t	down;
++	uint32_t	sym;
+ 	uint32_t	code;
+ };
+ 
+@@ -250,6 +269,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
+ }
+ 
+ static void
++rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_srvr_updt_msg supdt_msg;
++	struct rfb_srvr_rect_hdr srect_hdr;
++
++	/* Number of rectangles: 1 */
++	supdt_msg.type = 0;
++	supdt_msg.pad = 0;
++	supdt_msg.numrects = htons(1);
++	stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg));
++
++	/* Rectangle header */
++	srect_hdr.x = htons(0);
++	srect_hdr.y = htons(0);
++	srect_hdr.width = htons(rc->width);
++	srect_hdr.height = htons(rc->height);
++	srect_hdr.encoding = htonl(RFB_ENCODING_EXT_KEYEVENT);
++	stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr));
++}
++
++static void
+ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_pixfmt_msg pixfmt_msg;
+@@ -283,6 +323,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
+ 		case RFB_ENCODING_RESIZE:
+ 			rc->enc_resize_ok = true;
+ 			break;
++		case RFB_ENCODING_EXT_KEYEVENT:
++			rc->enc_extkeyevent_ok = true;
++			break;
+ 		}
+ 	}
+ }
+@@ -648,6 +691,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd, int
+ 			rfb_send_resize_update_msg(rc, cfd);
+ 	}
+ 
++	if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) {
++		rfb_send_extended_keyevent_update_msg(rc, cfd);
++		rc->enc_extkeyevent_send = true;
++	}
++
+ 	if (discardonly)
+ 		return;
+ 
+@@ -661,10 +709,24 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
+ 
+ 	(void)stream_read(cfd, ((void *)&key_msg) + 1, sizeof(key_msg) - 1);
+ 
+-	console_key_event(key_msg.down, htonl(key_msg.code));
++	console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0));
+ }
+ 
+ static void
++rfb_recv_client_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_client_msg client_msg;
++	struct rfb_extended_key_msg extkey_msg;
++
++	(void)stream_read(cfd, ((void *)&client_msg) + 1, sizeof(client_msg) - 1);
++
++	if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT ) {
++		(void)stream_read(cfd, ((void *)&extkey_msg) + 2, sizeof(extkey_msg) - 2);
++		console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code));
++	}
++}
++
++static void
+ rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_ptr_msg ptr_msg;
+@@ -903,6 +965,9 @@ rfb_handle(struct rfb_softc *rc, int cfd)
+ 		case 6:
+ 			rfb_recv_cuttext_msg(rc, cfd);
+ 			break;
++		case 255:
++			rfb_recv_client_msg(rc, cfd);
++			break;
+ 		default:
+ 			WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff));
+ 			goto done;
+@@ -937,6 +1002,9 @@ rfb_thr(void *arg)
+ 		rc->enc_raw_ok = false;
+ 		rc->enc_zlib_ok = false;
+ 		rc->enc_resize_ok = false;
++		rc->enc_extkeyevent_ok = false;
++
++		rc->enc_extkeyevent_send = false;
+ 
+ 		cfd = accept(rc->sfd, NULL, NULL);
+ 		if (rc->conn_wait) {

--- a/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
@@ -1,6 +1,6 @@
-diff -upN bhyve_orig/console.c bhyve/console.c
---- bhyve_orig/console.c	2020-06-14 10:25:23.470371000 +0900
-+++ bhyve/console.c	2020-06-14 16:06:49.475147000 +0900
+diff -uprN bhyve_orig/console.c bhyve/console.c
+--- bhyve_orig/console.c	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/console.c	2020-12-30 21:50:53.384428000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -14,9 +14,9 @@ diff -upN bhyve_orig/console.c bhyve/console.c
  }
  
  void
-diff -upN bhyve_orig/console.h bhyve/console.h
---- bhyve_orig/console.h	2020-06-14 10:25:23.454420000 +0900
-+++ bhyve/console.h	2020-06-14 16:06:49.475771000 +0900
+diff -uprN bhyve_orig/console.h bhyve/console.h
+--- bhyve_orig/console.h	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/console.h	2020-12-30 21:50:53.385443000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -35,9 +35,9 @@ diff -upN bhyve_orig/console.h bhyve/console.h
  
  void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
  void console_ptr_event(uint8_t button, int x, int y);
-diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_orig/ps2kbd.c	2020-06-14 10:25:24.140690000 +0900
-+++ bhyve/ps2kbd.c	2020-06-14 16:06:49.476779000 +0900
+diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
+--- bhyve_orig/ps2kbd.c	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/ps2kbd.c	2020-12-30 21:50:53.386722000 +0900
 @@ -181,6 +181,26 @@ static const uint8_t ascii_translations[128] = {
  		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
  };
@@ -128,21 +128,21 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	if (!fifo_full)
-diff -upN bhyve_orig/rfb.c bhyve/rfb.c
---- bhyve_orig/rfb.c	2020-06-14 10:25:24.141562000 +0900
-+++ bhyve/rfb.c	2020-06-14 16:06:49.477815000 +0900
-@@ -99,7 +99,10 @@ struct rfb_softc {
- 	bool	enc_raw_ok;
- 	bool	enc_zlib_ok;
- 	bool	enc_resize_ok;
-+	bool	enc_extkeyevent_ok;
+diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
+--- bhyve_orig/rfb.c	2020-12-24 09:12:34.000000000 +0900
++++ bhyve/rfb.c	2020-12-31 10:39:54.009578000 +0900
+@@ -118,7 +118,10 @@ struct rfb_softc {
+ 	bool		enc_raw_ok;
+ 	bool		enc_zlib_ok;
+ 	bool		enc_resize_ok;
++	bool		enc_extkeyevent_ok;
  
-+	bool	enc_extkeyevent_send;
++	bool		enc_extkeyevent_send;
 +
  	z_stream	zstream;
  	uint8_t		*zbuf;
  	int		zbuflen;
-@@ -145,7 +148,10 @@ struct rfb_pixfmt_msg {
+@@ -170,7 +173,10 @@ struct rfb_pixfmt_msg {
  #define	RFB_ENCODING_RAW		0
  #define	RFB_ENCODING_ZLIB		6
  #define	RFB_ENCODING_RESIZE		-223
@@ -153,7 +153,7 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  #define	RFB_MAX_WIDTH			2000
  #define	RFB_MAX_HEIGHT			1200
  #define	RFB_ZLIB_BUFSZ			RFB_MAX_WIDTH*RFB_MAX_HEIGHT*4
-@@ -172,6 +178,19 @@ struct rfb_key_msg {
+@@ -197,6 +203,19 @@ struct rfb_key_msg {
  	uint8_t		type;
  	uint8_t		down;
  	uint16_t	pad;
@@ -173,7 +173,7 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  	uint32_t	code;
  };
  
-@@ -250,6 +269,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
+@@ -277,6 +296,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
  }
  
  static void
@@ -201,7 +201,7 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
  {
  	struct rfb_pixfmt_msg pixfmt_msg;
-@@ -283,6 +323,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
+@@ -309,6 +349,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
  		case RFB_ENCODING_RESIZE:
  			rc->enc_resize_ok = true;
  			break;
@@ -211,24 +211,25 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  		}
  	}
  }
-@@ -648,6 +691,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd, int
- 			rfb_send_resize_update_msg(rc, cfd);
- 	}
+@@ -686,6 +729,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd)
+ 
+ 	(void)stream_read(cfd, ((void *)&updt_msg) + 1 , sizeof(updt_msg) - 1);
  
 +	if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) {
 +		rfb_send_extended_keyevent_update_msg(rc, cfd);
 +		rc->enc_extkeyevent_send = true;
 +	}
 +
- 	if (discardonly)
- 		return;
- 
-@@ -661,10 +709,24 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
+ 	rc->pending = true;
+ 	if (!updt_msg.incremental)
+ 		rc->update_all = true;
+@@ -698,11 +746,26 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
  
  	(void)stream_read(cfd, ((void *)&key_msg) + 1, sizeof(key_msg) - 1);
  
 -	console_key_event(key_msg.down, htonl(key_msg.code));
 +	console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0));
+ 	rc->input_detected = true;
  }
  
  static void
@@ -242,6 +243,7 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
 +	if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT ) {
 +		(void)stream_read(cfd, ((void *)&extkey_msg) + 2, sizeof(extkey_msg) - 2);
 +		console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code));
++		rc->input_detected = true;
 +	}
 +}
 +
@@ -249,8 +251,8 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
  {
  	struct rfb_ptr_msg ptr_msg;
-@@ -903,6 +965,9 @@ rfb_handle(struct rfb_softc *rc, int cfd)
- 		case 6:
+@@ -997,6 +1060,9 @@ report_and_done:
+ 		case CS_CUT_TEXT:
  			rfb_recv_cuttext_msg(rc, cfd);
  			break;
 +		case 255:
@@ -259,7 +261,7 @@ diff -upN bhyve_orig/rfb.c bhyve/rfb.c
  		default:
  			WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff));
  			goto done;
-@@ -937,6 +1002,9 @@ rfb_thr(void *arg)
+@@ -1031,6 +1097,9 @@ rfb_thr(void *arg)
  		rc->enc_raw_ok = false;
  		rc->enc_zlib_ok = false;
  		rc->enc_resize_ok = false;