D11090.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11090.diff
View Options

	Index: head/sys/kern/subr_param.c
	===================================================================
	--- head/sys/kern/subr_param.c
	+++ head/sys/kern/subr_param.c
	@@ -149,6 +149,7 @@
	"hv",
	"vmware",
	"kvm",
	+ "bhyve",
	NULL
	};
	CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST);
	Index: head/sys/sys/systm.h
	===================================================================
	--- head/sys/sys/systm.h
	+++ head/sys/sys/systm.h
	@@ -76,7 +76,7 @@
	* 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);
	Index: head/sys/x86/x86/identcpu.c
	===================================================================
	--- head/sys/x86/x86/identcpu.c
	+++ head/sys/x86/x86/identcpu.c
	@@ -1282,6 +1282,8 @@
	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;
	}