summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2012-01-26 22:29:17 +0000
committerRobert Mustacchi <rm@joyent.com>2012-01-26 22:37:29 +0000
commit76be9d4d13f5c5d32d915820bbf956b73fd89aab (patch)
tree330277aff3dd9c2d8210843b6389191ef138641b
parent3d2e6c9fd3135807b671a346582cf5f7cdcb0027 (diff)
downloadillumos-kvm-76be9d4d13f5c5d32d915820bbf956b73fd89aab.tar.gz
HVM-715 Enable AES support
-rw-r--r--kvm_x86.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kvm_x86.c b/kvm_x86.c
index 4f553d5..c1c4ee2 100644
--- a/kvm_x86.c
+++ b/kvm_x86.c
@@ -17,7 +17,7 @@
* GPL HEADER END
*
* Copyright 2011 various Linux Kernel contributors.
- * Copyright 2011 Joyent, Inc. All Rights Reserved.
+ * Copyright 2012 Joyent, Inc. All Rights Reserved.
*/
#include <sys/types.h>
@@ -1767,7 +1767,8 @@ do_cpuid_ent(struct kvm_cpuid_entry2 *entry, uint32_t function,
0 /* Reserved */ | F(CX16) | 0 /* xTPR Update, PDCM */ |
0 /* Reserved, DCA */ | F(XMM4_1) |
F(XMM4_2) | F(X2APIC) | F(MOVBE) | F(POPCNT) |
- 0 /* Reserved, XSAVE, OSXSAVE */;
+ 0 /* Reserved, XSAVE, OSXSAVE */ | F(AES) |
+ 0 /* AVX, Reserved */;
/* cpuid 0x80000001.ecx */
const uint32_t kvm_supported_word6_x86_features =
F(LAHF_LM) | F(CMP_LEGACY) | F(SVM) | 0 /* ExtApicSpace */ |