Merge pull request #1460 from alicefr/golangci-lint

s390x: fix golangci-lint complains

cli/kata-check_s390x_test.go

@@ -123,50 +123,50 @@ func TestArchKernelParamHandler(t *testing.T) {
 
 	type testData struct {
 		onVMM        bool
+		expectIgnore bool
 		fields       logrus.Fields
 		msg          string
-		expectIgnore bool
 	}
 
 	data := []testData{
-		{true, logrus.Fields{}, "", false},
+		{true, false, logrus.Fields{}, ""},
-		{false, logrus.Fields{}, "", false},
+		{false, false, logrus.Fields{}, ""},
 
 		{
+			false,
 			false,
 			logrus.Fields{
 				// wrong type
 				"parameter": 123,
 			},
 			"foo",
-			false,
 		},
 
 		{
+			false,
 			false,
 			logrus.Fields{
 				"parameter": "unrestricted_guest",
 			},
 			"",
-			false,
 		},
 
 		{
+			true,
 			true,
 			logrus.Fields{
 				"parameter": "unrestricted_guest",
 			},
 			"",
-			true,
 		},
 
 		{
 			false,
+			true,
 			logrus.Fields{
 				"parameter": "nested",
 			},
 			"",
-			true,
 		},
 	}
 

virtcontainers/qemu_s390x.go

@@ -100,9 +100,7 @@ func (q *qemuS390x) appendConsole(devices []govmmQemu.Device, path string) []gov
 
 	devices = append(devices, serial)
 
-	var console govmmQemu.CharDevice
+	console := govmmQemu.CharDevice{
-
-	console = govmmQemu.CharDevice{
 		Driver:   govmmQemu.Console,
 		Backend:  govmmQemu.Socket,
 		DeviceID: "console0",