From d66f21921b5a34f655b1bfb303ffe119baff8a14 Mon Sep 17 00:00:00 2001 From: "Pradipta Kr. Banerjee" Date: Mon, 29 Jun 2020 21:06:28 -0700 Subject: [PATCH] cli: Fix kata-env output on Power [ port from runtime commit 9ac39116b08148de8e66abfca2e5407bc153af87 ] kata-env output always shows "VMContainerCapable=false" on Power. This patch fixes the same. Signed-off-by: bpradipt@in.ibm.com Signed-off-by: Peng Tao --- src/runtime/cli/kata-env.go | 4 ---- src/runtime/cli/kata-env_ppc64le_test.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/runtime/cli/kata-env.go b/src/runtime/cli/kata-env.go index 12afdd649..193368f4b 100644 --- a/src/runtime/cli/kata-env.go +++ b/src/runtime/cli/kata-env.go @@ -9,7 +9,6 @@ import ( "encoding/json" "errors" "os" - runtim "runtime" "strings" "github.com/BurntSushi/toml" @@ -223,9 +222,6 @@ func getHostInfo() (HostInfo, error) { } hostVMContainerCapable := true - if runtim.GOARCH == "ppc64le" { - hostVMContainerCapable = false - } details := vmContainerCapableDetails{ cpuInfoFile: procCPUInfo, diff --git a/src/runtime/cli/kata-env_ppc64le_test.go b/src/runtime/cli/kata-env_ppc64le_test.go index 81666f716..a794ba338 100644 --- a/src/runtime/cli/kata-env_ppc64le_test.go +++ b/src/runtime/cli/kata-env_ppc64le_test.go @@ -10,7 +10,7 @@ import "testing" func getExpectedHostDetails(tmpdir string) (HostInfo, error) { expectedVendor := "" expectedModel := "POWER8" - expectedVMContainerCapable := false + expectedVMContainerCapable := true return genericGetExpectedHostDetails(tmpdir, expectedVendor, expectedModel, expectedVMContainerCapable) }