svn commit: r324573 - in stable/10/sys/dev/hyperv: include vmbus

[Sepherosa Ziehau]

Author: sephe
Date: Fri Oct 13 02:16:35 2017
New Revision: 324573
URL: https://svnweb.freebsd.org/changeset/base/324573

Log:
  MFC 324488
  
      hyperv/vmbus: Expose Hyper-V major version.
  
      Sponsored by:   Microsoft

Modified:
  stable/10/sys/dev/hyperv/include/hyperv.h
  stable/10/sys/dev/hyperv/vmbus/hyperv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hyperv/include/hyperv.h
==============================================================================
--- stable/10/sys/dev/hyperv/include/hyperv.h	Fri Oct 13 02:01:03 2017	(r324572)
+++ stable/10/sys/dev/hyperv/include/hyperv.h	Fri Oct 13 02:16:35 2017	(r324573)
@@ -90,6 +90,7 @@ int			hyperv_guid2str(const struct hyperv_guid *, char
  */
 extern hyperv_tc64_t	hyperv_tc64;
 extern u_int		hyperv_features;	/* CPUID_HV_MSR_ */
+extern u_int		hyperv_ver_major;
 
 #endif	/* _KERNEL */
 

Modified: stable/10/sys/dev/hyperv/vmbus/hyperv.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hyperv.c	Fri Oct 13 02:01:03 2017	(r324572)
+++ stable/10/sys/dev/hyperv/vmbus/hyperv.c	Fri Oct 13 02:16:35 2017	(r324573)
@@ -77,6 +77,8 @@ static u_int			hyperv_get_timecount(struct timecounter
 static bool			hyperv_identify(void);
 static void			hypercall_memfree(void);
 
+u_int				hyperv_ver_major;
+
 u_int				hyperv_features;
 u_int				hyperv_recommends;
 
@@ -169,8 +171,9 @@ hyperv_identify(void)
 	hyperv_features3 = regs[3];
 
 	do_cpuid(CPUID_LEAF_HV_IDENTITY, regs);
+	hyperv_ver_major = regs[1] >> 16;
 	printf("Hyper-V Version: %d.%d.%d [SP%d]\n",
-	    regs[1] >> 16, regs[1] & 0xffff, regs[0], regs[2]);
+	    hyperv_ver_major, regs[1] & 0xffff, regs[0], regs[2]);
 
 	printf("  Features=0x%b\n", hyperv_features,
 	    "\020"