summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormlarkin <mlarkin@openbsd.org>2016-04-25 15:24:55 +0000
committermlarkin <mlarkin@openbsd.org>2016-04-25 15:24:55 +0000
commit9f12662a2564406beff4bc3571191e2fe180f097 (patch)
treeffde8d7aa7812eb9dcc7cc16ea4b47fd638f4b07
parentmake vmctl 'create' usage description match the man page (diff)
downloadwireguard-openbsd-9f12662a2564406beff4bc3571191e2fe180f097.tar.xz
wireguard-openbsd-9f12662a2564406beff4bc3571191e2fe180f097.zip
add a few new exit types found in newer cpus
-rw-r--r--sys/arch/amd64/amd64/vmm.c5
-rw-r--r--sys/arch/amd64/include/vmmvar.h5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index 00a8c42d038..a13b3409cbf 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.54 2016/04/17 00:15:28 dlg Exp $ */
+/* $OpenBSD: vmm.c,v 1.55 2016/04/25 15:24:55 mlarkin Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -3778,6 +3778,9 @@ vmx_exit_reason_decode(uint32_t code)
case VMX_EXIT_RDRAND: return "RDRAND instruction";
case VMX_EXIT_INVPCID: return "INVPCID instruction";
case VMX_EXIT_VMFUNC: return "VMFUNC instruction";
+ case VMX_EXIT_RDSEED: return "RDSEED instruction";
+ case VMX_EXIT_XSAVES: return "XSAVES instruction";
+ case VMX_EXIT_XRSTORS: return "XRSTORS instruction";
default: return "unknown";
}
}
diff --git a/sys/arch/amd64/include/vmmvar.h b/sys/arch/amd64/include/vmmvar.h
index ce15c3e1a4d..cd76b75d00d 100644
--- a/sys/arch/amd64/include/vmmvar.h
+++ b/sys/arch/amd64/include/vmmvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmmvar.h,v 1.12 2016/04/06 06:15:06 mlarkin Exp $ */
+/* $OpenBSD: vmmvar.h,v 1.13 2016/04/25 15:24:55 mlarkin Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -97,6 +97,9 @@
#define VMX_EXIT_RDRAND 57
#define VMX_EXIT_INVPCID 58
#define VMX_EXIT_VMFUNC 59
+#define VMX_EXIT_RDSEED 61
+#define VMX_EXIT_XSAVES 63
+#define VMX_EXIT_XRSTORS 64
#define VM_EXIT_TERMINATED 0xFFFE
#define VM_EXIT_NONE 0xFFFF