Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
kata-check: do not require nested vt
Browse files Browse the repository at this point in the history
We do not really require nested VT to run kata containers. Let's not
depend on it being there.

Fixes: #820

Signed-off-by: Peng Tao <[email protected]>
  • Loading branch information
bergwolf committed Oct 16, 2018
1 parent ea9ecd7 commit acbcde3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions cli/kata-check_amd64.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func setCPUtype() {
"kvm_intel": {
desc: "Intel KVM",
parameters: map[string]string{
"nested": "Y",
// "VMX Unrestricted mode support". This is used
// as a heuristic to determine if the system is
// "new enough" to run a Kata Container
Expand Down Expand Up @@ -97,9 +96,6 @@ func setCPUtype() {
},
"kvm_amd": {
desc: "AMD KVM",
parameters: map[string]string{
"nested": "1",
},
},
"vhost": {
desc: msgKernelVirtio,
Expand Down
5 changes: 1 addition & 4 deletions cli/kata-check_amd64_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,13 @@ func TestCCCheckCLIFunction(t *testing.T) {

moduleData = []testModuleData{
{filepath.Join(sysModuleDir, "kvm_intel/parameters/unrestricted_guest"), false, "Y"},
{filepath.Join(sysModuleDir, "kvm_intel/parameters/nested"), false, "Y"},
}
} else if cpuType == cpuTypeAMD {
cpuData = []testCPUData{
{archAuthenticAMD, "lm svm sse4_1", false},
}

moduleData = []testModuleData{
{filepath.Join(sysModuleDir, "kvm_amd/parameters/nested"), false, "1"},
}
moduleData = []testModuleData{}
}

devNull, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0666)
Expand Down

0 comments on commit acbcde3

Please sign in to comment.