summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2013-04-11 04:29:45 +0000
committerneel <neel@FreeBSD.org>2013-04-11 04:29:45 +0000
commitea145a8678878b2fe9970cf8eb1b49a3fd807dec (patch)
treeebbe41b7272496899c4f61f8db5999bce8f76424 /sys/amd64
parent042dd07575e9e0a4e598c59543e7af7d4684a70a (diff)
downloadFreeBSD-src-ea145a8678878b2fe9970cf8eb1b49a3fd807dec.zip
FreeBSD-src-ea145a8678878b2fe9970cf8eb1b49a3fd807dec.tar.gz
Make the code to check if VMX is enabled more readable by using macros
instead of magic numbers. Discussed with: Chris Torek
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/vmm/intel/vmx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index d927cd9..fb41074 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -441,7 +441,8 @@ vmx_init(void)
* are set (bits 0 and 2 respectively).
*/
feature_control = rdmsr(MSR_IA32_FEATURE_CONTROL);
- if ((feature_control & 0x5) != 0x5) {
+ if ((feature_control & IA32_FEATURE_CONTROL_LOCK) == 0 ||
+ (feature_control & IA32_FEATURE_CONTROL_VMX_EN) == 0) {
printf("vmx_init: VMX operation disabled by BIOS\n");
return (ENXIO);
}
OpenPOWER on IntegriCloud