svn commit: r320568 - in stable/11/sys: kern sys x86/x86
Marcelo Araujo
araujo at FreeBSD.org
Sun Jul 2 04:19:05 UTC 2017
Author: araujo
Date: Sun Jul 2 04:19:03 2017
New Revision: 320568
URL: https://svnweb.freebsd.org/changeset/base/320568
Log:
MFC r319678:
Allow sysctl kern.vm_guest to return bhyve when running under bhyve.
Submitted by: Sean Fagan <sef at ixsystems.com>
Reviewed by: grehan
MFH: 4 weeks.
Sponsored by: iXsystems, Inc.
Differential Revision: https://reviews.freebsd.org/D11090
Modified:
stable/11/sys/kern/subr_param.c
stable/11/sys/sys/systm.h
stable/11/sys/x86/x86/identcpu.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/subr_param.c
==============================================================================
--- stable/11/sys/kern/subr_param.c Sun Jul 2 04:14:34 2017 (r320567)
+++ stable/11/sys/kern/subr_param.c Sun Jul 2 04:19:03 2017 (r320568)
@@ -149,6 +149,7 @@ static const char *const vm_guest_sysctl_names[] = {
"hv",
"vmware",
"kvm",
+ "bhyve",
NULL
};
CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST);
Modified: stable/11/sys/sys/systm.h
==============================================================================
--- stable/11/sys/sys/systm.h Sun Jul 2 04:14:34 2017 (r320567)
+++ stable/11/sys/sys/systm.h Sun Jul 2 04:19:03 2017 (r320568)
@@ -76,7 +76,7 @@ extern int vm_guest; /* Running as virtual machine gu
* Keep in sync with vm_guest_sysctl_names[].
*/
enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
- VM_GUEST_VMWARE, VM_GUEST_KVM, VM_LAST };
+ VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_LAST };
#if defined(WITNESS) || defined(INVARIANT_SUPPORT)
void kassert_panic(const char *fmt, ...) __printflike(1, 2);
Modified: stable/11/sys/x86/x86/identcpu.c
==============================================================================
--- stable/11/sys/x86/x86/identcpu.c Sun Jul 2 04:14:34 2017 (r320567)
+++ stable/11/sys/x86/x86/identcpu.c Sun Jul 2 04:19:03 2017 (r320568)
@@ -1282,6 +1282,8 @@ identify_hypervisor(void)
vm_guest = VM_GUEST_HV;
else if (strcmp(hv_vendor, "KVMKVMKVM") == 0)
vm_guest = VM_GUEST_KVM;
+ else if (strcmp(hv_vendor, "bhyve bhyve") == 0)
+ vm_guest = VM_GUEST_BHYVE;
}
return;
}
More information about the svn-src-all
mailing list