ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-17 22:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vmm_x86: fix sporadic test failures on x86_32 nova

Browse Source 
Explicitly configure wanted exits instead of using the "random" primary
ctrl value.
This commit is contained in:
Alexander Boettcher
2021-12-20 16:55:36 +01:00
committed by Christian Helmuth
parent 81acd46518
commit 507e5ac776
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
repos/os/src/test/vmm_x86/component.cc
View File

@ -102,7 +102,10 @@ class Vmm::Vcpu
INTEL_CTRL_SECOND_UG = 1 << 7, INTEL_CTRL_SECOND_UG = 1 << 7,
INTEL_CTRL_SECOND_RDTSCP_ENABLE = 1 << 3, INTEL_CTRL_SECOND_RDTSCP_ENABLE = 1 << 3,
}; };
enum { AMD_CTRL_SECOND_VMRUN = 1 << 0 }; enum {
AMD_CTRL_PRIMARY_HLT = 1 << 24,
AMD_CTRL_SECOND_VMRUN = 1 << 0
};
/* http://www.sandpile.org/x86/initial.htm */ /* http://www.sandpile.org/x86/initial.htm */
@ -137,7 +140,7 @@ class Vmm::Vcpu
INTEL_CTRL_SECOND_RDTSCP_ENABLE); INTEL_CTRL_SECOND_RDTSCP_ENABLE);
} }
if (_svm) { if (_svm) {
/* required for native AMD hardware (!= Qemu) for NOVA */ state.ctrl_primary.charge(AMD_CTRL_PRIMARY_HLT);
state.ctrl_secondary.charge(AMD_CTRL_SECOND_VMRUN); state.ctrl_secondary.charge(AMD_CTRL_SECOND_VMRUN);
} }