github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

kata-check: do not require nested vt

Browse Source 
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 <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-10-15 10:18:29 +08:00
parent ea9ecd7386
commit acbcde3fee
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/kata-check_amd64.go
View File

@ -67,7 +67,6 @@ func setCPUtype() {
"kvm_intel": { "kvm_intel": {
desc: "Intel KVM", desc: "Intel KVM",
parameters: map[string]string{ parameters: map[string]string{
"nested": "Y",
// "VMX Unrestricted mode support". This is used // "VMX Unrestricted mode support". This is used
// as a heuristic to determine if the system is // as a heuristic to determine if the system is
// "new enough" to run a Kata Container // "new enough" to run a Kata Container
@ -97,9 +96,6 @@ func setCPUtype() {
}, },
"kvm_amd": { "kvm_amd": {
desc: "AMD KVM", desc: "AMD KVM",
parameters: map[string]string{
"nested": "1",
},
}, },
"vhost": { "vhost": {
desc: msgKernelVirtio, desc: msgKernelVirtio,

5
cli/kata-check_amd64_test.go
View File

@ -83,16 +83,13 @@ func TestCCCheckCLIFunction(t *testing.T) {
moduleData = []testModuleData{ moduleData = []testModuleData{
{filepath.Join(sysModuleDir, "kvm_intel/parameters/unrestricted_guest"), false, "Y"}, {filepath.Join(sysModuleDir, "kvm_intel/parameters/unrestricted_guest"), false, "Y"},
{filepath.Join(sysModuleDir, "kvm_intel/parameters/nested"), false, "Y"},
} }
} else if cpuType == cpuTypeAMD { } else if cpuType == cpuTypeAMD {
cpuData = []testCPUData{ cpuData = []testCPUData{
{archAuthenticAMD, "lm svm sse4_1", false}, {archAuthenticAMD, "lm svm sse4_1", false},
} }
moduleData = []testModuleData{ moduleData = []testModuleData{}
{filepath.Join(sysModuleDir, "kvm_amd/parameters/nested"), false, "1"},
}
} }
devNull, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0666) devNull, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0666)