コミット: f066ef71db54cd95ef438eaa955f9385f174ef06 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

コミットメタ情報

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

ログメッセージ

kbdlayout: Cut out the QEMU extended keyboard event message function part into another patch.
kbdlayout: Add patch file for vmrun.sh.
qemuextkey: Split from keyboard option patch file.

変更サマリ

• delete: kbdlayout_option/bhyve_kbdlayout_fbsd121r.patch => qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd121r.patch
• delete: kbdlayout_option/bhyve_kbdlayout_fbsd13c.patch => qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
• add: kbdlayout_option/bhyve_kbdlayout_option_fbsd121r.patch
• add: kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
• add: kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd121r.patch
• add: kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13c.patch
• delete: kbdlayout_option/{bhyve_kbdlayout.shar => bhyve_kbdlayout_layoutfile.shar}

差分

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd121r.patch
@@ -0,0 +1,248 @@
+diff -upN bhyve_base/Makefile bhyve/Makefile
+--- bhyve_base/Makefile	2020-06-02 20:16:51.532368000 +0900
++++ bhyve/Makefile	2020-06-02 20:35:48.179160000 +0900
+@@ -95,4 +95,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-02 20:16:51.487013000 +0900
++++ bhyve/bhyve.8	2020-06-02 20:35:48.180745000 +0900
+@@ -44,6 +44,7 @@
+ .Op Ar ,threads=n
+ .Oc
+ .Op Fl g Ar gdbport
++.Op Fl k Ar layout
+ .Op Fl l Ar help|lpcdev Ns Op , Ns Ar conf
+ .Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t
+ .Op Fl p Ar vcpu:hostcpu
+@@ -144,6 +145,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 -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
+--- bhyve_base/bhyverun.c	2020-06-02 20:16:51.456344000 +0900
++++ bhyve/bhyverun.c	2020-06-02 20:35:48.181837000 +0900
+@@ -165,6 +165,8 @@ char *vmname;
+ int guest_ncpus;
+ uint16_t cores, maxcpus, sockets, threads;
+ 
++char *kbdlayout_name;
++
+ char *guest_uuid_str;
+ 
+ static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
+@@ -211,7 +213,7 @@ usage(int code)
+         fprintf(stderr,
+ 		"Usage: %s [-abehuwxACHPSWY]\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"
+@@ -221,6 +223,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"
+@@ -996,8 +999,9 @@ main(int argc, char *argv[])
+ 	mptgen = 1;
+ 	rtc_localtime = 1;
+ 	memflags = 0;
++	kbdlayout_name = NULL;
+ 
+-	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:";
++	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:k:U:";
+ 	while ((c = getopt(argc, argv, optstr)) != -1) {
+ 		switch (c) {
+ 		case 'a':
+@@ -1033,6 +1037,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 -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
+--- bhyve_base/bhyverun.h	2020-06-02 20:16:51.511202000 +0900
++++ bhyve/bhyverun.h	2020-06-02 20:35:48.182282000 +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 -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
+--- bhyve_base/ps2kbd.c	2020-06-02 20:29:26.881702000 +0900
++++ bhyve/ps2kbd.c	2020-06-02 20:35:48.184181000 +0900
+@@ -31,15 +31,20 @@
+ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.c 341757 2018-12-09 06:41:57Z araujo $");
+ 
+ #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 "console.h"
+ 
+@@ -58,6 +63,8 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
+ 
+ #define	PS2KBD_FIFOSZ		16
+ 
++#define PS2KBD_LAYOUT_BASEDIR	"/usr/share/bhyve/kbdlayout/"
++
+ struct fifo {
+ 	uint8_t	buf[PS2KBD_FIFOSZ];
+ 	uint8_t	trans[PS2KBD_FIFOSZ];
+@@ -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,
+@@ -319,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 = (uint8_t)(keycode & 0x7f);
+@@ -375,10 +382,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
+ 		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);

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
@@ -0,0 +1,251 @@
+diff -upN bhyve_base/Makefile bhyve/Makefile
+--- bhyve_base/Makefile	2020-06-03 10:29:29.352291000 +0900
++++ bhyve/Makefile	2020-06-03 18:14:34.462454000 +0900
+@@ -121,4 +121,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-03 10:29:29.331537000 +0900
++++ bhyve/bhyve.8	2020-06-03 18:14:34.464867000 +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
+@@ -162,6 +163,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 -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
+--- bhyve_base/bhyverun.c	2020-06-03 10:29:29.370019000 +0900
++++ bhyve/bhyverun.c	2020-06-03 18:19:50.608647000 +0900
+@@ -188,6 +188,8 @@ const char *vmname;
+ int guest_ncpus;
+ uint16_t cores, maxcpus, sockets, threads;
+ 
++char *kbdlayout_name;
++
+ char *guest_uuid_str;
+ 
+ int raw_stdio = 0;
+@@ -237,7 +239,7 @@ usage(int code)
+         fprintf(stderr,
+ 		"Usage: %s [-abehuwxACHPSWY]\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)
+ 		"       -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"
+ #ifdef BHYVE_SNAPSHOT
+@@ -1084,11 +1087,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:";
+ #else
+-	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:";
++	optstr = "abehuwxACHIPSWYp: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[])
+ 				optarg++;
+ 			}
+ 			gdb_port = atoi(optarg);
++			break;
++		case 'k':
++			kbdlayout_name = optarg;
+ 			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-03 10:29:29.289487000 +0900
++++ bhyve/bhyverun.h	2020-06-03 18:18:13.198204000 +0900
+@@ -39,6 +39,7 @@ extern int guest_ncpus;
+ extern uint16_t cores, sockets, threads;
+ extern char *guest_uuid_str;
+ extern const char *vmname;
++extern char *kbdlayout_name;
+ 
+ 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-03 10:31:37.339319000 +0900
++++ bhyve/ps2kbd.c	2020-06-03 18:17:01.983386000 +0900
+@@ -31,6 +31,7 @@
+ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 360648 2020-05-05 00:02:04Z jhb $");
+ 
+ #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
+ #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"
+@@ -62,6 +66,8 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 36064
+ 
+ #define	PS2KBD_FIFOSZ		16
+ 
++#define PS2KBD_LAYOUT_BASEDIR	"/usr/share/bhyve/kbdlayout/"
++
+ struct fifo {
+ 	uint8_t	buf[PS2KBD_FIFOSZ];
+ 	uint8_t	trans[PS2KBD_FIFOSZ];
+@@ -91,7 +97,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 */
+@@ -163,7 +169,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,
+@@ -323,7 +329,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 = (uint8_t)(keycode & 0x7f);
+@@ -379,10 +385,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
+ 		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);

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd121r.patch
@@ -0,0 +1,41 @@
+diff -upN examples/bhyve_orig/vmrun.sh examples/bhyve/vmrun.sh
+--- examples/bhyve_orig/vmrun.sh	2019-11-01 09:01:57.000000000 +0900
++++ examples/bhyve/vmrun.sh	2020-05-30 20:39:06.066218000 +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}"

--- /dev/null
+++ b/kbdlayout_option/bhyve_kbdlayout_vmrunsh_fbsd13c.patch
@@ -0,0 +1,41 @@
+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
+@@ -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_fbsd121r.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd121r.patch
@@ -1,16 +1,6 @@
-diff -upN bhyve_orig/Makefile bhyve/Makefile
---- bhyve_orig/Makefile	2020-05-01 11:25:57.446272000 +0900
-+++ bhyve/Makefile	2020-05-28 09:25:47.142698000 +0900
-@@ -95,4 +95,6 @@ CFLAGS+=-DGDB_LOG
- 
- WARNS?=	2
- 
-+SUBDIR=	kbdlayout
-+
- .include <bsd.prog.mk>
 diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
 --- bhyve_orig/atkbdc.c	2020-05-01 11:25:57.441270000 +0900
-+++ bhyve/atkbdc.c	2020-05-28 16:28:56.411057000 +0900
++++ bhyve/atkbdc.c	2020-06-02 20:27:26.516809000 +0900
 @@ -211,24 +211,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
  		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
  	};
@@ -40,95 +30,9 @@ diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
  				atkbdc_kbd_queue_data(sc, val);
  			else
  				break;
-diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
---- bhyve_orig/bhyve.8	2020-05-01 11:25:57.441891000 +0900
-+++ bhyve/bhyve.8	2020-05-28 14:26:02.139585000 +0900
-@@ -44,6 +44,7 @@
- .Op Ar ,threads=n
- .Oc
- .Op Fl g Ar gdbport
-+.Op Fl k Ar layout
- .Op Fl l Ar help|lpcdev Ns Op , Ns Ar conf
- .Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t
- .Op Fl p Ar vcpu:hostcpu
-@@ -144,6 +145,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 -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
---- bhyve_orig/bhyverun.c	2020-05-01 11:25:57.439138000 +0900
-+++ bhyve/bhyverun.c	2020-05-28 09:25:47.144660000 +0900
-@@ -165,6 +165,8 @@ char *vmname;
- int guest_ncpus;
- uint16_t cores, maxcpus, sockets, threads;
- 
-+char *kbdlayout_name;
-+
- char *guest_uuid_str;
- 
- static int guest_vmexit_on_hlt, guest_vmexit_on_pause;
-@@ -211,7 +213,7 @@ usage(int code)
-         fprintf(stderr,
- 		"Usage: %s [-abehuwxACHPSWY]\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"
-@@ -221,6 +223,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"
-@@ -996,8 +999,9 @@ main(int argc, char *argv[])
- 	mptgen = 1;
- 	rtc_localtime = 1;
- 	memflags = 0;
-+	kbdlayout_name = NULL;
- 
--	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:";
-+	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:k:U:";
- 	while ((c = getopt(argc, argv, optstr)) != -1) {
- 		switch (c) {
- 		case 'a':
-@@ -1033,6 +1037,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 -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
---- bhyve_orig/bhyverun.h	2020-05-01 11:25:57.444136000 +0900
-+++ bhyve/bhyverun.h	2020-05-28 09:25:47.145111000 +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 -upN bhyve_orig/console.c bhyve/console.c
 --- bhyve_orig/console.c	2020-05-01 11:25:57.441001000 +0900
-+++ bhyve/console.c	2020-05-28 10:47:10.699395000 +0900
++++ bhyve/console.c	2020-06-02 20:27:26.517334000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -144,7 +48,7 @@ diff -upN bhyve_orig/console.c bhyve/console.c
  void
 diff -upN bhyve_orig/console.h bhyve/console.h
 --- bhyve_orig/console.h	2020-05-01 11:25:57.446732000 +0900
-+++ bhyve/console.h	2020-05-28 10:47:47.290438000 +0900
++++ bhyve/console.h	2020-06-02 20:27:26.517796000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -163,62 +67,18 @@ 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);
-Common subdirectories: bhyve_orig/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 --- bhyve_orig/ps2kbd.c	2020-05-01 11:25:57.446548000 +0900
-+++ bhyve/ps2kbd.c	2020-05-28 16:28:16.325233000 +0900
-@@ -31,15 +31,20 @@
- __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.c 341757 2018-12-09 06:41:57Z araujo $");
- 
- #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 "console.h"
- 
-@@ -58,8 +63,11 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
++++ bhyve/ps2kbd.c	2020-06-02 20:29:26.881702000 +0900
+@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
  
- #define	PS2KBD_FIFOSZ		16
- 
-+#define PS2KBD_LAYOUT_BASEDIR	"/usr/share/bhyve/kbdlayout/"
-+
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
 +	uint8_t	trans[PS2KBD_FIFOSZ];
  	int	rindex;		/* index to read from */
  	int	windex;		/* index to write to */
  	int	num;		/* number of bytes in the fifo */
-@@ -86,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 */
-@@ -158,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,
-@@ -197,26 +205,28 @@ fifo_reset(struct ps2kbd_softc *sc)
+@@ -197,26 +198,28 @@ fifo_reset(struct ps2kbd_softc *sc)
  }
  
  static void
@@ -249,7 +109,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		fifo->rindex = (fifo->rindex + 1) % fifo->size;
  		fifo->num--;
  		return (0);
-@@ -226,12 +236,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
+@@ -226,12 +229,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
  }
  
  int
@@ -264,7 +124,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	return (retval);
-@@ -244,13 +254,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -244,13 +247,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
  	if (sc->curcmd) {
  		switch (sc->curcmd) {
  		case PS2KC_SET_TYPEMATIC:
@@ -281,7 +141,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			break;
  		default:
  			fprintf(stderr, "Unhandled ps2 keyboard current "
-@@ -261,41 +271,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -261,41 +264,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
  	} else {
  		switch (val) {
  		case 0x00:
@@ -335,7 +195,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			break;
  		default:
  			fprintf(stderr, "Unhandled ps2 keyboard command "
-@@ -311,26 +321,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -311,26 +314,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
   */
  static void
  ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
@@ -345,8 +205,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
--	const struct extended_translation *trans;
-+	struct extended_translation *trans;
+ 	const struct extended_translation *trans;
  
 -	found = 0;
 -	if (keysym < 0x80) {
@@ -381,7 +240,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			}
  		}
  	}
-@@ -341,14 +357,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -341,14 +350,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  	}
  
  	if (e0_prefix)
@@ -400,7 +259,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  {
  	struct ps2kbd_softc *sc = arg;
  	int fifo_full;
-@@ -359,17 +375,98 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+@@ -359,7 +368,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
  		return;
  	}
  	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
@@ -409,100 +268,9 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	if (!fifo_full)
- 		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);
 diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
 --- bhyve_orig/ps2kbd.h	2020-05-01 11:25:57.441775000 +0900
-+++ bhyve/ps2kbd.h	2020-05-28 13:42:50.937234000 +0900
++++ bhyve/ps2kbd.h	2020-06-02 20:27:26.519082000 +0900
 @@ -35,7 +35,7 @@ struct atkbdc_softc;
  
  struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
@@ -514,7 +282,7 @@ diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
  #endif /* _PS2KBD_H_ */
 diff -upN bhyve_orig/rfb.c bhyve/rfb.c
 --- bhyve_orig/rfb.c	2020-05-01 11:25:57.446856000 +0900
-+++ bhyve/rfb.c	2020-05-28 13:16:38.135646000 +0900
++++ bhyve/rfb.c	2020-06-02 20:27:26.520216000 +0900
 @@ -97,7 +97,10 @@ struct rfb_softc {
  	bool	enc_raw_ok;
  	bool	enc_zlib_ok;

--- a/kbdlayout_option/bhyve_kbdlayout_fbsd13c.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
@@ -1,17 +1,7 @@
-diff -upN bhyve_orig/Makefile bhyve/Makefile
---- bhyve_orig/Makefile	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/Makefile	2020-05-29 18:03:10.627095000 +0900
-@@ -99,4 +99,6 @@ CFLAGS+=-DGDB_LOG
- 
- WARNS?=	2
- 
-+SUBDIR=	kbdlayout
-+
- .include <bsd.prog.mk>
 diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
---- bhyve_orig/atkbdc.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/atkbdc.c	2020-05-29 18:03:10.653893000 +0900
-@@ -211,24 +211,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
+--- bhyve_orig/atkbdc.c	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/atkbdc.c	2020-06-03 10:31:37.337347000 +0900
+@@ -216,24 +216,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
  		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
  	};
  	uint8_t val;
@@ -40,95 +30,9 @@ diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
  				atkbdc_kbd_queue_data(sc, val);
  			else
  				break;
-diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
---- bhyve_orig/bhyve.8	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyve.8	2020-05-29 18:11:54.290185000 +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
-@@ -161,6 +162,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 -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
---- bhyve_orig/bhyverun.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyverun.c	2020-05-29 18:03:10.699642000 +0900
-@@ -168,6 +168,8 @@ char *vmname;
- int guest_ncpus;
- uint16_t cores, maxcpus, sockets, threads;
- 
-+char *kbdlayout_name;
-+
- char *guest_uuid_str;
- 
- int raw_stdio = 0;
-@@ -217,7 +219,7 @@ usage(int code)
-         fprintf(stderr,
- 		"Usage: %s [-abehuwxACHPSWY]\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"
-@@ -227,6 +229,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"
-@@ -1020,8 +1023,9 @@ main(int argc, char *argv[])
- 	mptgen = 1;
- 	rtc_localtime = 1;
- 	memflags = 0;
-+	kbdlayout_name = NULL;
- 
--	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:U:";
-+	optstr = "abehuwxACHIPSWYp:g:G:c:s:m:l:k:U:";
- 	while ((c = getopt(argc, argv, optstr)) != -1) {
- 		switch (c) {
- 		case 'a':
-@@ -1057,6 +1061,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 -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
---- bhyve_orig/bhyverun.h	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyverun.h	2020-05-29 18:03:10.703030000 +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 -upN bhyve_orig/console.c bhyve/console.c
---- bhyve_orig/console.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/console.c	2020-05-29 18:03:10.705936000 +0900
+--- bhyve_orig/console.c	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/console.c	2020-06-03 10:31:37.338047000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -143,8 +47,8 @@ diff -upN bhyve_orig/console.c bhyve/console.c
  
  void
 diff -upN bhyve_orig/console.h bhyve/console.h
---- bhyve_orig/console.h	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/console.h	2020-05-29 18:03:10.708779000 +0900
+--- bhyve_orig/console.h	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/console.h	2020-06-03 10:31:37.338668000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -163,62 +67,18 @@ 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);
-Common subdirectories: bhyve_orig/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_orig/ps2kbd.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/ps2kbd.c	2020-05-29 18:03:10.788431000 +0900
-@@ -31,15 +31,20 @@
- __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 356523 2020-01-08 22:55:22Z 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,8 +64,11 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 35652
- 
- #define	PS2KBD_FIFOSZ		16
- 
-+#define PS2KBD_LAYOUT_BASEDIR	"/usr/share/bhyve/kbdlayout/"
-+
+--- bhyve_orig/ps2kbd.c	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/ps2kbd.c	2020-06-03 10:31:37.339319000 +0900
+@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 36064
+ 
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
 +	uint8_t	trans[PS2KBD_FIFOSZ];
  	int	rindex;		/* index to read from */
  	int	windex;		/* index to write to */
  	int	num;		/* number of bytes in the fifo */
-@@ -87,7 +95,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 +167,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,
-@@ -198,26 +206,28 @@ fifo_reset(struct ps2kbd_softc *sc)
+@@ -201,26 +202,28 @@ fifo_reset(struct ps2kbd_softc *sc)
  }
  
  static void
@@ -249,7 +109,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		fifo->rindex = (fifo->rindex + 1) % fifo->size;
  		fifo->num--;
  		return (0);
-@@ -227,12 +237,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
+@@ -230,12 +233,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
  }
  
  int
@@ -264,7 +124,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	return (retval);
-@@ -245,13 +255,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -248,13 +251,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
  	if (sc->curcmd) {
  		switch (sc->curcmd) {
  		case PS2KC_SET_TYPEMATIC:
@@ -281,7 +141,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			break;
  		default:
  			EPRINTLN("Unhandled ps2 keyboard current "
-@@ -262,41 +272,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -265,41 +268,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
  	} else {
  		switch (val) {
  		case 0x00:
@@ -335,7 +195,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			break;
  		default:
  			EPRINTLN("Unhandled ps2 keyboard command "
-@@ -312,26 +322,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -315,26 +318,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
   */
  static void
  ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
@@ -345,8 +205,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
--	const struct extended_translation *trans;
-+	struct extended_translation *trans;
+ 	const struct extended_translation *trans;
  
 -	found = 0;
 -	if (keysym < 0x80) {
@@ -381,7 +240,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			}
  		}
  	}
-@@ -342,14 +358,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -345,14 +354,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  	}
  
  	if (e0_prefix)
@@ -400,7 +259,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  {
  	struct ps2kbd_softc *sc = arg;
  	int fifo_full;
-@@ -360,17 +376,98 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+@@ -363,7 +372,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
  		return;
  	}
  	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
@@ -409,101 +268,10 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	if (!fifo_full)
- 		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);
 diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
---- bhyve_orig/ps2kbd.h	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/ps2kbd.h	2020-05-29 18:03:10.795460000 +0900
-@@ -35,7 +35,7 @@ struct atkbdc_softc;
+--- bhyve_orig/ps2kbd.h	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/ps2kbd.h	2020-06-03 10:31:37.339486000 +0900
+@@ -36,7 +36,7 @@ struct vm_snapshot_meta;
  
  struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
  
@@ -511,10 +279,10 @@ diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
 +int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans);
  void ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val);
  
- #endif /* _PS2KBD_H_ */
+ #ifdef BHYVE_SNAPSHOT
 diff -upN bhyve_orig/rfb.c bhyve/rfb.c
---- bhyve_orig/rfb.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/rfb.c	2020-05-29 18:03:10.843000000 +0900
+--- bhyve_orig/rfb.c	2020-05-28 09:02:50.000000000 +0900
++++ bhyve/rfb.c	2020-06-03 10:31:37.339898000 +0900
 @@ -99,7 +99,10 @@ struct rfb_softc {
  	bool	enc_raw_ok;
  	bool	enc_zlib_ok;