summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@openbsd.org>2016-10-18 15:16:55 +0000
committernaddy <naddy@openbsd.org>2016-10-18 15:16:55 +0000
commit4a69b4bde45e8eb2d3a13f14ae77f2c7526c47b4 (patch)
tree885f01d454dd4246aabf90970bba40b568c87390
parentMake grid_clear_cell set up the entry properly for 256 and RGB cells. (diff)
downloadwireguard-openbsd-4a69b4bde45e8eb2d3a13f14ae77f2c7526c47b4.tar.xz
wireguard-openbsd-4a69b4bde45e8eb2d3a13f14ae77f2c7526c47b4.zip
SVM on AMD CPUs is not supported yet, so don't attach there; ok mlarkin@
-rw-r--r--sys/arch/amd64/amd64/vmm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index 949302a5359..0e6a8fb5965 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.93 2016/10/13 19:36:25 martijn Exp $ */
+/* $OpenBSD: vmm.c,v 1.94 2016/10/18 15:16:55 naddy Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -282,7 +282,8 @@ vmm_probe(struct device *parent, void *match, void *aux)
if (found_vmx && found_svm)
return (0);
- if (found_vmx || found_svm)
+ /* SVM is not implemented yet */
+ if (found_vmx)
return 1;
if (vm_disabled)
printf("vmm disabled by firmware\n");