|
From: <sv...@va...> - 2010-09-30 10:52:05
|
Author: sewardj
Date: 2010-09-30 11:51:56 +0100 (Thu, 30 Sep 2010)
New Revision: 2055
Log:
amd64 CPUID: don't claim that the guest supports AES insns,
since it doesn't. Fixes #249991.
Modified:
trunk/priv/guest_amd64_helpers.c
Modified: trunk/priv/guest_amd64_helpers.c
===================================================================
--- trunk/priv/guest_amd64_helpers.c 2010-09-29 21:39:48 UTC (rev 2054)
+++ trunk/priv/guest_amd64_helpers.c 2010-09-30 10:51:56 UTC (rev 2055)
@@ -2042,6 +2042,7 @@
dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16
xtpr pdcm sse4_1 sse4_2 popcnt aes lahf_lm ida
arat tpr_shadow vnmi flexpriority ept vpid
+ MINUS aes (see below)
bogomips : 6957.57
clflush size : 64
cache_alignment : 64
@@ -2065,7 +2066,10 @@
SET_ABCD(0x0000000b, 0x756e6547, 0x6c65746e, 0x49656e69);
break;
case 0x00000001:
- SET_ABCD(0x00020652, 0x00100800, 0x0298e3ff, 0xbfebfbff);
+ // & ~(1<<25): don't claim to support AES insns. See
+ // bug 249991.
+ SET_ABCD(0x00020652, 0x00100800, 0x0298e3ff & ~(1<<25),
+ 0xbfebfbff);
break;
case 0x00000002:
SET_ABCD(0x55035a01, 0x00f0b2e3, 0x00000000, 0x09ca212c);
|