提交: b74a2a2e75cbc10d0bbc6ff15ad60d859ffe3d20 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

Commit MetaInfo

• 修訂: b74a2a2e75cbc10d0bbc6ff15ad60d859ffe3d20 (tree)
• 時間: 2021-05-03 22:32:34
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

* Update for FreeBSD 13.0-RELASE.(Along with this, the patch filename was changed)
* Fix the following issues on the FreeBSD review site. (Addition of CS_MSG_CLIENT_QEMU constant) (https://reviews.freebsd.org/D29430)

Change Summary

• delete: qemu_ext_keyevent_msg/{bhyve_qemu_ext_key_event_msg_fbsd13c.patch => bhyve_qemu_ext_key_event_msg_fbsd130r.patch}

差異

--- a/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd130r.patch
@@ -1,6 +1,6 @@
 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
+--- bhyve_orig/console.c	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/console.c	2021-05-03 13:11:57.869902000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -15,8 +15,8 @@ diff -uprN bhyve_orig/console.c bhyve/console.c
  
  void
 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
+--- bhyve_orig/console.h	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/console.h	2021-05-03 13:11:57.870288000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -36,8 +36,8 @@ diff -uprN 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 -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
+--- bhyve_orig/ps2kbd.c	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/ps2kbd.c	2021-05-03 13:11:57.870908000 +0900
 @@ -181,6 +181,26 @@ static const uint8_t ascii_translations[128] = {
  		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
  };
@@ -129,9 +129,17 @@ diff -uprN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  
  	if (!fifo_full)
 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 {
+--- bhyve_orig/rfb.c	2021-04-09 09:24:13.000000000 +0900
++++ bhyve/rfb.c	2021-05-03 13:13:08.713857000 +0900
+@@ -98,6 +98,7 @@ static int rfb_debug = 0;
+ #define CS_KEY_EVENT		4
+ #define CS_POINTER_EVENT	5
+ #define CS_CUT_TEXT		6
++#define CS_MSG_CLIENT_QEMU	255
+ 
+ #define SECURITY_TYPE_NONE	1
+ #define SECURITY_TYPE_VNC_AUTH	2
+@@ -118,7 +119,10 @@ struct rfb_softc {
  	bool		enc_raw_ok;
  	bool		enc_zlib_ok;
  	bool		enc_resize_ok;
@@ -142,7 +150,7 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  	z_stream	zstream;
  	uint8_t		*zbuf;
  	int		zbuflen;
-@@ -170,7 +173,10 @@ struct rfb_pixfmt_msg {
+@@ -170,7 +174,10 @@ struct rfb_pixfmt_msg {
  #define	RFB_ENCODING_RAW		0
  #define	RFB_ENCODING_ZLIB		6
  #define	RFB_ENCODING_RESIZE		-223
@@ -153,7 +161,7 @@ diff -uprN 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
-@@ -197,6 +203,19 @@ struct rfb_key_msg {
+@@ -197,6 +204,19 @@ struct rfb_key_msg {
  	uint8_t		type;
  	uint8_t		down;
  	uint16_t	pad;
@@ -173,7 +181,7 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  	uint32_t	code;
  };
  
-@@ -277,6 +296,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
+@@ -277,6 +297,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
  }
  
  static void
@@ -201,7 +209,7 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
  {
  	struct rfb_pixfmt_msg pixfmt_msg;
-@@ -309,6 +349,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
+@@ -309,6 +350,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
  		case RFB_ENCODING_RESIZE:
  			rc->enc_resize_ok = true;
  			break;
@@ -211,7 +219,7 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  		}
  	}
  }
-@@ -686,6 +729,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd)
+@@ -686,6 +730,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd)
  
  	(void)stream_read(cfd, ((void *)&updt_msg) + 1 , sizeof(updt_msg) - 1);
  
@@ -223,7 +231,7 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  	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)
+@@ -698,11 +747,26 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
  
  	(void)stream_read(cfd, ((void *)&key_msg) + 1, sizeof(key_msg) - 1);
  
@@ -251,17 +259,17 @@ diff -uprN bhyve_orig/rfb.c bhyve/rfb.c
  rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
  {
  	struct rfb_ptr_msg ptr_msg;
-@@ -997,6 +1060,9 @@ report_and_done:
+@@ -997,6 +1061,9 @@ report_and_done:
  		case CS_CUT_TEXT:
  			rfb_recv_cuttext_msg(rc, cfd);
  			break;
-+		case 255:
++		case CS_MSG_CLIENT_QEMU:
 +			rfb_recv_client_msg(rc, cfd);
 +			break;
  		default:
  			WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff));
  			goto done;
-@@ -1031,6 +1097,9 @@ rfb_thr(void *arg)
+@@ -1031,6 +1098,9 @@ rfb_thr(void *arg)
  		rc->enc_raw_ok = false;
  		rc->enc_zlib_ok = false;
  		rc->enc_resize_ok = false;