kata-runtime: Return correct kata-env on ppc64le

The contents of /proc/cpuinfo were
trimmed and hence the "model" field could
not be parsed despite being a field in
/proc/cpuinfo. Fix this issue.

Fixes: kata-containers#1089

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com

cli/kata-check.go

@@ -76,14 +76,11 @@ func getCPUInfo(cpuInfoFile string) (string, error) {
 		return "", err
 	}
 
-	cpus := strings.SplitAfter(text, "\n\n")
-
-	trimmed := strings.TrimSpace(cpus[0])
-	if trimmed == "" {
+	if len(strings.TrimSpace(text)) == 0 {
 		return "", fmt.Errorf("Cannot determine CPU details")
 	}
 
-	return trimmed, nil
+	return text, nil
 }
 
 // findAnchoredString searches haystack for needle and returns true if found

cli/kata-check_ppc64le.go

@@ -98,11 +98,7 @@ func archKernelParamHandler(onVMM bool, fields logrus.Fields, msg string) bool {
 }
 
 func getCPUDetails() (vendor, model string, err error) {
-	vendor, model, err = genericGetCPUDetails()
-	if err == nil {
-		model = "POWER8"
-	}
-	return vendor, model, err
+	return genericGetCPUDetails()
 }
 
 func isSMTOff() bool {

cli/kata-check_test.go

@@ -192,10 +192,10 @@ func TestCheckGetCPUInfo(t *testing.T) {
 		{" ", "", true},
 		{"\n", "", true},
 		{"\n\n", "", true},
-		{"hello\n", "hello", false},
-		{"foo\n\n", "foo", false},
-		{"foo\n\nbar\n\n", "foo", false},
-		{"foo\n\nbar\nbaz\n\n", "foo", false},
+		{"hello\n", "hello\n", false},
+		{"foo\n\n", "foo\n\n", false},
+		{"foo\n\nbar\n\n", "foo\n\nbar\n\n", false},
+		{"foo\n\nbar\nbaz\n\n", "foo\n\nbar\nbaz\n\n", false},
 	}
 
 	dir, err := ioutil.TempDir("", "")