svn commit: r317124 - in stable/10/sys: conf dev/hyperv/input

[Sepherosa Ziehau]

Author: sephe
Date: Wed Apr 19 05:19:33 2017
New Revision: 317124
URL: https://svnweb.freebsd.org/changeset/base/317124

Log:
  MFC 316515,316812
  
  316515
      hyperv/kbd: Add support for synthetic keyboard.
  
      Synthetic keyboard is the only supported keyboard on GEN2 Hyper-V.
  
      Submitted by:   Hongjiang Zhang <honzhan microsoft com>
      Sponsored by:   Microsoft
      Differential Revision:  https://reviews.freebsd.org/D10196
  
  316812
      hyperv/kbd: Remove unnecessary assignment.
  
      Reported by:    PVS
      Sponsored by:   Microsoft

Added:
  stable/10/sys/dev/hyperv/input/
     - copied from r316515, head/sys/dev/hyperv/input/
Modified:
  stable/10/sys/conf/files.amd64
  stable/10/sys/dev/hyperv/input/hv_kbdc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files.amd64
==============================================================================
--- stable/10/sys/conf/files.amd64	Wed Apr 19 03:43:24 2017	(r317123)
+++ stable/10/sys/conf/files.amd64	Wed Apr 19 05:19:33 2017	(r317124)
@@ -261,6 +261,8 @@ dev/hwpmc/hwpmc_uncore.c	optional	hwpmc
 dev/hwpmc/hwpmc_piv.c		optional	hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc
+dev/hyperv/input/hv_kbd.c				optional	hyperv
+dev/hyperv/input/hv_kbdc.c				optional	hyperv
 dev/hyperv/pcib/vmbus_pcib.c				optional	hyperv pci
 dev/hyperv/netvsc/hn_nvs.c				optional	hyperv
 dev/hyperv/netvsc/hn_rndis.c				optional	hyperv

Modified: stable/10/sys/dev/hyperv/input/hv_kbdc.c
==============================================================================
--- head/sys/dev/hyperv/input/hv_kbdc.c	Wed Apr  5 05:01:23 2017	(r316515)
+++ stable/10/sys/dev/hyperv/input/hv_kbdc.c	Wed Apr 19 05:19:33 2017	(r317124)
@@ -298,7 +298,6 @@ hv_kbd_read_channel(struct vmbus_channel
 	int ret = 0;
 
 	hv_kbd_sc *sc = (hv_kbd_sc*)context;
-	channel = vmbus_get_channel(sc->dev);
 	buf = sc->buf;
 	buflen = sc->buflen;
 	for (;;) {