Module Name: src
Committed By: maxv
Date: Fri Oct 4 12:15:21 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c
Log Message:
Fix definition for MWAIT. It should be bit 11, not 12; 12 is the armed
version.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.47 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.48
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.47 Fri Oct 4 12:11:38 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Fri Oct 4 12:15:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.47 2019/10/04 12:11:38 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.48 2019/10/04 12:15:21 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.47 2019/10/04 12:11:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.48 2019/10/04 12:15:21 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -287,7 +287,8 @@ struct vmcb_ctrl {
#define VMCB_CTRL_INTERCEPT_ICEBP __BIT(8)
#define VMCB_CTRL_INTERCEPT_WBINVD __BIT(9)
#define VMCB_CTRL_INTERCEPT_MONITOR __BIT(10)
-#define VMCB_CTRL_INTERCEPT_MWAIT __BIT(12)
+#define VMCB_CTRL_INTERCEPT_MWAIT __BIT(11)
+#define VMCB_CTRL_INTERCEPT_MWAIT_ARMED __BIT(12)
#define VMCB_CTRL_INTERCEPT_XSETBV __BIT(13)
#define VMCB_CTRL_INTERCEPT_RDPRU __BIT(14)
#define VMCB_CTRL_INTERCEPT_EFER_SPEC __BIT(15)
