diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-11-13 07:52:21 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-11-13 07:52:21 +0000 |
| commit | 207e48e84cdbc60695417e94cc230d340d5f2028 (patch) | |
| tree | f012cc1efae9cdaa15a35bd7e4310a53c4cbde57 /sys/dev | |
| parent | e61de7fde46443b42ab120089f15aa14219d1c30 (diff) | |
vmm(4) kernel code
circulated on hackers@, no objections. Disabled by default.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pv/pvbus.c | 6 | ||||
| -rw-r--r-- | sys/dev/pv/pvvar.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/pv/pvbus.c b/sys/dev/pv/pvbus.c index 3871aa4c6b8..358c55ef9d6 100644 --- a/sys/dev/pv/pvbus.c +++ b/sys/dev/pv/pvbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pvbus.c,v 1.5 2015/07/29 17:08:46 mikeb Exp $ */ +/* $OpenBSD: pvbus.c,v 1.6 2015/11/13 07:52:20 mlarkin Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -31,6 +31,7 @@ #include <sys/socket.h> #include <machine/specialreg.h> +#include <machine/vmmvar.h> #include <dev/rndvar.h> @@ -76,7 +77,8 @@ struct pvbus_type { { "Microsoft Hv", "Hyper-V", pvbus_hyperv }, { "VMwareVMware", "VMware", NULL }, { "XenVMMXenVMM", "Xen", pvbus_xen }, - { "bhyve bhyve ", "bhyve", NULL } + { "bhyve bhyve ", "bhyve", NULL }, + { VMM_HV_SIGNATURE, "OpenBSD", NULL }, }; int diff --git a/sys/dev/pv/pvvar.h b/sys/dev/pv/pvvar.h index c44ed5b4fe7..f015e111ef4 100644 --- a/sys/dev/pv/pvvar.h +++ b/sys/dev/pv/pvvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pvvar.h,v 1.4 2015/07/28 09:48:52 reyk Exp $ */ +/* $OpenBSD: pvvar.h,v 1.5 2015/11/13 07:52:20 mlarkin Exp $ */ /* * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org> @@ -25,6 +25,7 @@ enum { PVBUS_VMWARE, PVBUS_XEN, PVBUS_BHYVE, + PVBUS_OPENBSD, PVBUS_MAX }; |