Skip to content

Commit b3129c7

Browse files
committed
fix(vmm): Disable SVM on T2A template
(cherry picked from commit 681e781) Althought T2A and T2CL templates together aim to provide instruction set feature parity, T2CL disables nested virtualization (VMX) but T2A does not disable it (SVM). This commit disables SVM on T2A template. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent 70b800a commit b3129c7

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
IA32_ARCH_CAPABILITIES MSR from the host in accordance with an Intel microcode
3636
update.
3737
- Fixed passing through cache information from host in CPUID leaf 0x80000005.
38+
- Fixed the T2A CPU template to disable SVM (nested virtualization).
3839

3940
## [1.3.0]
4041

resources/tests/static_cpu_templates/t2a.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"modifiers": [
6868
{
6969
"register": "ecx",
70-
"bitmap": "0bxx0xxxxxxxxxxxxxxxxxxxx000xxxxxx"
70+
"bitmap": "0bxx0xxxxxxxxxxxxxxxxxxxx000xxx0xx"
7171
},
7272
{
7373
"register": "edx",

src/vmm/src/cpu_config/x86_64/static_cpu_templates/t2a.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pub fn t2a() -> CustomCpuTemplate {
101101
CpuidRegisterModifier {
102102
register: CpuidRegister::Ecx,
103103
bitmap: RegisterValueFilter {
104-
filter: 0b00100000000000000000000111000000,
104+
filter: 0b00100000000000000000000111000100,
105105
value: 0b00000000000000000000000000000000,
106106
},
107107
},

0 commit comments

Comments
 (0)