コミット: 64183a6152c17fb4bcafcaef1acb6be81400e886 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

コミットメタ情報

• リビジョン: 64183a6152c17fb4bcafcaef1acb6be81400e886 (tree)
• 日時: 2021-05-03 23:00:42
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

* Change keyboard layout specification option to "-K" (uppercase K). (Because "-k" is used for other purposes in FreeBSD current's bhyve)
* Fix the following issues on the FreeBSD review site. (Corrected the violation of man's notation rule by incorporating the content of the proposal on the review side.) (https://reviews.freebsd.org/D29473)

変更サマリ

• modified: kbdlayout_option/bhyve_kbdlayout_option_fbsd122r.patch

差分

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd122r.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd122r.patch
@@ -1,6 +1,6 @@
 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
++++ bhyve/Makefile	2021-05-03 22:14:14.502876000 +0900
 @@ -95,4 +95,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -10,32 +10,33 @@ diff -uprN bhyve_orig/Makefile bhyve/Makefile
  .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
++++ bhyve/bhyve.8	2021-05-03 22:14:50.353899000 +0900
 @@ -47,6 +47,7 @@
  .Sm on
  .Op Fl G Ar port
  .Op Fl g Ar gdbport
-+.Op Fl k Ar layout
++.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.
+@@ -163,6 +164,14 @@ 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
++.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.
++This specification only works when loaded with UEFI mode for VNC.
++(Not working via serial console or SSH)
++When using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), this option isn't needed.
++When using a VNC client that doesn't support QEMU Extended Key Event Message (e.g. tightVNC), the default layout defaults to the US keyboard unless specified otherwise.
  .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
++++ bhyve/bhyverun.c	2021-05-03 22:14:14.504885000 +0900
 @@ -165,6 +165,8 @@ char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
@@ -50,7 +51,7 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  		"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 [-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"
@@ -58,7 +59,7 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  		"       -g: gdb port\n"
  		"       -h: help\n"
  		"       -H: vmexit from the guest on hlt\n"
-+		"       -k: PS2 keyboard layout\n"
++		"       -K: PS2 keyboard layout\n"
  		"       -l: LPC device configuration\n"
  		"       -m: memory size in MB\n"
  		"       -p: pin 'vcpu' to 'hostcpu'\n"
@@ -69,7 +70,7 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
 +	kbdlayout_name = NULL;
  
 -	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:";
-+	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:";
++	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:K:U:";
  	while ((c = getopt(argc, argv, optstr)) != -1) {
  		switch (c) {
  		case 'a':
@@ -78,14 +79,14 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  			}
  			gdb_port = atoi(optarg);
 +			break;
-+		case 'k':
++		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
++++ bhyve/bhyverun.h	2021-05-03 22:14:14.505299000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -96,7 +97,7 @@ diff -uprN bhyve_orig/bhyverun.h bhyve/bhyverun.h
  
 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
++++ bhyve/ps2kbd.c	2021-05-03 22:14:14.506115000 +0900
 @@ -31,15 +31,20 @@
  __FBSDID("$FreeBSD: releng/12.2/usr.sbin/bhyve/ps2kbd.c 358184 2020-02-20 21:48:36Z vmaffione $");