Re: #include "hvkbd.h"

[Kimihiro Nonaka <nonakap%gmail.com@localhost>]

On Sun, May 26, 2019 at 9:09 AM Ryosuke Moro <szptvlfn%a-net.email.ne.jp@localhost> wrote:
>
>
> my kernel conf:
>   # Hyper-V devices
>   #vmbus*     at acpi?        # Hyper-V VMBus
>   #genfb*     at vmbus?       # Hyper-V Synthetic Video Framebuffer
>   #hvkbd*     at vmbus?       # Hyper-V Synthetic Keyboard
>   #wskbd*     at hvkbd? console ? mux 1
>   #hvn*       at vmbus?       # Hyper-V NetVSC
>   #hvs*       at vmbus?       # Hyper-V StorVSC
>   #hvheartbeat*   at vmbus?       # Hyper-V Heartbeat Service
>   #hvshutdown*    at vmbus?       # Hyper-V Guest Shutdown Service
>   #hvtimesync*    at vmbus?       # Hyper-V Time Synchronization Service
>   #hvkvp*     at vmbus?       # Hyper-V Data Exchange Service
>
>
>
> --- consinit.d ---
> /usr/src/sys/arch/x86/x86/consinit.c:95:10: fatal error: hvkbd.h: No such file or directory
>  #include "hvkbd.h"
>           ^~~~~~~~~
> compilation terminated.
> nbmkdep: compile failed.
> *** [consinit.d] Error code 1

It does not occur in my environment...

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 7d6e6e0357a..057ed673add 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1066,15 +1066,15 @@ viornd* at virtio?            # Virtio entropy device
 vioscsi* at virtio?            # Virtio SCSI device

 # Hyper-V devices
-vmbus*        at acpi?        # Hyper-V VMBus
-genfb*        at vmbus?        # Hyper-V Synthetic Video Framebuffer
-hvkbd*        at vmbus?        # Hyper-V Synthetic Keyboard
-wskbd*        at hvkbd? console ? mux 1
-hvn*        at vmbus?        # Hyper-V NetVSC
-hvs*        at vmbus?        # Hyper-V StorVSC
-hvheartbeat*    at vmbus?        # Hyper-V Heartbeat Service
-hvshutdown*    at vmbus?        # Hyper-V Guest Shutdown Service
-hvtimesync*    at vmbus?        # Hyper-V Time Synchronization Service
+#vmbus*        at acpi?        # Hyper-V VMBus
+#genfb*        at vmbus?        # Hyper-V Synthetic Video Framebuffer
+#hvkbd*        at vmbus?        # Hyper-V Synthetic Keyboard
+#wskbd*        at hvkbd? console ? mux 1
+#hvn*        at vmbus?        # Hyper-V NetVSC
+#hvs*        at vmbus?        # Hyper-V StorVSC
+#hvheartbeat*    at vmbus?        # Hyper-V Heartbeat Service
+#hvshutdown*    at vmbus?        # Hyper-V Guest Shutdown Service
+#hvtimesync*    at vmbus?        # Hyper-V Time Synchronization Service
 #hvkvp*        at vmbus?        # Hyper-V Data Exchange Service

 # Pull in optional local configuration
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2df1f7699ce..5e814db9864 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1405,15 +1405,15 @@ viornd* at virtio?            # Virtio entropy device
 vioscsi* at virtio?            # Virtio SCSI device

 # Hyper-V devices
-vmbus*        at acpi?        # Hyper-V VMBus
-genfb*        at vmbus?        # Hyper-V Synthetic Video Framebuffer
-hvkbd*        at vmbus?        # Hyper-V Synthetic Keyboard
-wskbd*        at hvkbd? console ? mux 1
-hvn*        at vmbus?        # Hyper-V NetVSC
-hvs*        at vmbus?        # Hyper-V StorVSC
-hvheartbeat*    at vmbus?        # Hyper-V Heartbeat Service
-hvshutdown*    at vmbus?        # Hyper-V Guest Shutdown Service
-hvtimesync*    at vmbus?        # Hyper-V Time Synchronization Service
+#vmbus*        at acpi?        # Hyper-V VMBus
+#genfb*        at vmbus?        # Hyper-V Synthetic Video Framebuffer
+#hvkbd*        at vmbus?        # Hyper-V Synthetic Keyboard
+#wskbd*        at hvkbd? console ? mux 1
+#hvn*        at vmbus?        # Hyper-V NetVSC
+#hvs*        at vmbus?        # Hyper-V StorVSC
+#hvheartbeat*    at vmbus?        # Hyper-V Heartbeat Service
+#hvshutdown*    at vmbus?        # Hyper-V Guest Shutdown Service
+#hvtimesync*    at vmbus?        # Hyper-V Time Synchronization Service
 #hvkvp*        at vmbus?        # Hyper-V Data Exchange Service


diff --git a/sys/arch/x86/x86/consinit.c b/sys/arch/x86/x86/consinit.c
index b8fecd7eaac..feff2107b8e 100644
--- a/sys/arch/x86/x86/consinit.c
+++ b/sys/arch/x86/x86/consinit.c
@@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.30
2019/05/26 00:30:35 christos Exp $
 #endif

 #ifndef XEN
-#if NHVKBD > 0
 #include "hvkbd.h"
+#if NHVKBD > 0
 #include <dev/hyperv/hvkbdvar.h>
 #endif
 #endif

Regards,
-- 
Kimihiro Nonaka