Merge r257996,r258001,r258069 from head: fixes for HyperV guest.

- Set description string for VM_GUEST_HV (HyperV guest).
- Add a brief comment about VM_GUEST and vm_guest_sysctl_names relationship.
- CTASSERT that vm_guest range is covered by vm_guest_sysctl_names.

Approved by:	re (glebius)

2 files changed, 5 insertions, 1 deletions

diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index e6b76f9..afd3eac 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -153,8 +153,10 @@ static const char *const vm_guest_sysctl_names[] = {
 	"none",
 	"generic",
 	"xen",
+	"hv",
 	NULL
 };
+CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST);
 
 #ifndef XEN
 static const char *const vm_bnames[] = {
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index b86f7a2..0405d8b 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -70,8 +70,10 @@ extern int vm_guest;		/* Running as virtual machine guest? */
  * Detected virtual machine guest types. The intention is to expand
  * and/or add to the VM_GUEST_VM type if specific VM functionality is
  * ever implemented (e.g. vendor-specific paravirtualization features).
+ * Keep in sync with vm_guest_sysctl_names[].
  */
-enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV };
+enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
+		VM_LAST };
 
 #if defined(WITNESS) || defined(INVARIANTS)
 void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);