コミット: e5fa1dd331f6b810e2c74a75fea1ab80381d50f3 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

コミットメタ情報

• リビジョン: e5fa1dd331f6b810e2c74a75fea1ab80381d50f3 (tree)
• 日時: 2021-05-03 22:45:35
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

* Update for FreeBSD 13.0-RELEASE.(Along with this, the patch filename was changed)
* 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)

変更サマリ

• delete: kbdlayout_option/{bhyve_kbdlayout_option_fbsd13c.patch => bhyve_kbdlayout_option_fbsd130r.patch}

差分

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd130r.patch
@@ -1,7 +1,7 @@
 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
+--- bhyve_orig/Makefile	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/Makefile	2021-05-03 13:23:03.033648000 +0900
+@@ -131,4 +131,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
  
@@ -9,34 +9,35 @@ 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-12-24 09:12:34.000000000 +0900
-+++ bhyve/bhyve.8	2020-12-30 21:24:17.882128000 +0900
-@@ -47,6 +47,7 @@
+--- bhyve_orig/bhyve.8	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/bhyve.8	2021-05-03 13:30:52.846171000 +0900
+@@ -46,6 +46,7 @@
+ .Oc
  .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
-@@ -166,6 +167,13 @@ Print help message and exit.
+@@ -149,6 +150,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-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;
+--- bhyve_orig/bhyverun.c	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/bhyverun.c	2021-05-03 13:29:03.821960000 +0900
+@@ -188,6 +188,8 @@ const char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
  
@@ -45,51 +46,51 @@ diff -uprN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  char *guest_uuid_str;
  
  int raw_stdio = 0;
-@@ -239,7 +241,7 @@ usage(int code)
+@@ -238,7 +240,7 @@ usage(int code)
          fprintf(stderr,
- 		"Usage: %s [-abehuwxACDHPSWY]\n"
+ 		"Usage: %s [-aehuwxACDHPSWY]\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 [-l <lpc>]\n"
++		"       %*s [-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"
-@@ -250,6 +252,7 @@ usage(int code)
- 		"       -g: gdb port\n"
+@@ -248,6 +250,7 @@ usage(int code)
+ 		"       -e: exit on unhandled I/O access\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"
  #ifdef BHYVE_SNAPSHOT
-@@ -1109,11 +1112,12 @@ main(int argc, char *argv[])
+@@ -1105,11 +1108,12 @@ main(int argc, char *argv[])
  	mptgen = 1;
  	rtc_localtime = 1;
  	memflags = 0;
 +	kbdlayout_name = NULL;
  
  #ifdef BHYVE_SNAPSHOT
--	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:r:";
-+	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:r:";
+-	optstr = "aehuwxACDHIPSWYp:G:c:s:m:l:U:r:";
++	optstr = "aehuwxACDHIPSWYp:G:c:s:m:l:K:U:r:";
  #else
--	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:U:";
-+	optstr = "abehuwxACDHIPSWYp:g:G:c:s:m:l:k:U:";
+-	optstr = "aehuwxACDHIPSWYp:G:c:s:m:l:U:";
++	optstr = "aehuwxACDHIPSWYp:G:c:s:m:l:K:U:";
  #endif
  	while ((c = getopt(argc, argv, optstr)) != -1) {
  		switch (c) {
-@@ -1155,6 +1159,9 @@ main(int argc, char *argv[])
+@@ -1143,6 +1147,9 @@ main(int argc, char *argv[])
  				optarg++;
  			}
  			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-12-24 09:12:34.000000000 +0900
-+++ bhyve/bhyverun.h	2020-12-30 21:24:17.885813000 +0900
+--- bhyve_orig/bhyverun.h	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/bhyverun.h	2021-05-03 13:23:03.037115000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -99,8 +100,8 @@ diff -uprN bhyve_orig/bhyverun.h bhyve/bhyverun.h
  void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
  #ifdef BHYVE_SNAPSHOT
 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
+--- bhyve_orig/ps2kbd.c	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/ps2kbd.c	2021-05-03 13:23:03.037837000 +0900
 @@ -31,6 +31,7 @@
  __FBSDID("$FreeBSD$");