From 5611283ec51bdd6dbbfd83757ae9085d4fe6b38c Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@hyper.sh>
Date: Sun, 27 Sep 2020 20:23:17 +0800
Subject: [PATCH] runtime: fix golint errors

Need to run gofmt -s on them.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
---
 .../containerd-shim-v2/shim_metrics_test.go   |  4 ++--
 .../device/manager/utils_test.go              |  4 ++--
 src/runtime/virtcontainers/qemu_arch_base.go  | 24 +++++++++----------
 src/runtime/virtcontainers/qemu_ppc64le.go    | 14 +++++------
 src/runtime/virtcontainers/qemu_s390x.go      | 14 +++++------
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/runtime/containerd-shim-v2/shim_metrics_test.go b/src/runtime/containerd-shim-v2/shim_metrics_test.go
index ba1afe552a..03b09ee991 100644
--- a/src/runtime/containerd-shim-v2/shim_metrics_test.go
+++ b/src/runtime/containerd-shim-v2/shim_metrics_test.go
@@ -68,10 +68,10 @@ func TestStatsSandbox(t *testing.T) {
 		StatsFunc:          getSandboxCPUFunc(1000, 100000),
 		StatsContainerFunc: getStatsContainerCPUFunc(100, 200, 10000, 20000),
 		MockContainers: []*vcmock.Container{
-			&vcmock.Container{
+			{
 				MockID: "foo",
 			},
-			&vcmock.Container{
+			{
 				MockID: "bar",
 			},
 		},
diff --git a/src/runtime/virtcontainers/device/manager/utils_test.go b/src/runtime/virtcontainers/device/manager/utils_test.go
index cbf18e35d0..baf8aa95bb 100644
--- a/src/runtime/virtcontainers/device/manager/utils_test.go
+++ b/src/runtime/virtcontainers/device/manager/utils_test.go
@@ -75,7 +75,7 @@ func TestIsVhostUserBlk(t *testing.T) {
 		isVhostUserBlk := isVhostUserBlk(
 			config.DeviceInfo{
 				DevType: d.devType,
-				Major: d.major,
+				Major:   d.major,
 			})
 		assert.Equal(t, d.expected, isVhostUserBlk)
 	}
@@ -100,7 +100,7 @@ func TestIsVhostUserSCSI(t *testing.T) {
 		isVhostUserSCSI := isVhostUserSCSI(
 			config.DeviceInfo{
 				DevType: d.devType,
-				Major: d.major,
+				Major:   d.major,
 			})
 		assert.Equal(t, d.expected, isVhostUserSCSI)
 	}
diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go
index 363bc3fd93..ba1f66b52a 100644
--- a/src/runtime/virtcontainers/qemu_arch_base.go
+++ b/src/runtime/virtcontainers/qemu_arch_base.go
@@ -136,18 +136,18 @@ type qemuArch interface {
 }
 
 type qemuArchBase struct {
-	qemuMachine           govmmQemu.Machine
-	qemuExePath           string
-	memoryOffset          uint32
-	nestedRun             bool
-	vhost                 bool
-	disableNvdimm         bool
-	dax                   bool
-	networkIndex          int
-	kernelParamsNonDebug  []Param
-	kernelParamsDebug     []Param
-	kernelParams          []Param
-	Bridges               []types.Bridge
+	qemuMachine          govmmQemu.Machine
+	qemuExePath          string
+	memoryOffset         uint32
+	nestedRun            bool
+	vhost                bool
+	disableNvdimm        bool
+	dax                  bool
+	networkIndex         int
+	kernelParamsNonDebug []Param
+	kernelParamsDebug    []Param
+	kernelParams         []Param
+	Bridges              []types.Bridge
 }
 
 const (
diff --git a/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go
index e19340da28..86fc141d79 100644
--- a/src/runtime/virtcontainers/qemu_ppc64le.go
+++ b/src/runtime/virtcontainers/qemu_ppc64le.go
@@ -36,7 +36,7 @@ var kernelParams = []Param{
 	{"net.ifnames", "0"},
 }
 
-var supportedQemuMachine = govmmQemu.Machine {
+var supportedQemuMachine = govmmQemu.Machine{
 	Type:    QemuPseries,
 	Options: defaultQemuMachineOptions,
 }
@@ -63,12 +63,12 @@ func newQemuArch(config HypervisorConfig) (qemuArch, error) {
 
 	q := &qemuPPC64le{
 		qemuArchBase{
-			qemuMachine:           supportedQemuMachine,
-			qemuExePath:           defaultQemuPath,
-			memoryOffset:          config.MemOffset,
-			kernelParamsNonDebug:  kernelParamsNonDebug,
-			kernelParamsDebug:     kernelParamsDebug,
-			kernelParams:          kernelParams,
+			qemuMachine:          supportedQemuMachine,
+			qemuExePath:          defaultQemuPath,
+			memoryOffset:         config.MemOffset,
+			kernelParamsNonDebug: kernelParamsNonDebug,
+			kernelParamsDebug:    kernelParamsDebug,
+			kernelParams:         kernelParams,
 		},
 	}
 
diff --git a/src/runtime/virtcontainers/qemu_s390x.go b/src/runtime/virtcontainers/qemu_s390x.go
index 132d7d7813..a43fe4bff8 100644
--- a/src/runtime/virtcontainers/qemu_s390x.go
+++ b/src/runtime/virtcontainers/qemu_s390x.go
@@ -36,7 +36,7 @@ var kernelParams = []Param{
 
 var ccwbridge = types.NewBridge(types.CCW, "", make(map[uint32]string, types.CCWBridgeMaxCapacity), 0)
 
-var supportedQemuMachine = govmmQemu.Machine {
+var supportedQemuMachine = govmmQemu.Machine{
 	Type:    QemuCCWVirtio,
 	Options: defaultQemuMachineOptions,
 }
@@ -61,12 +61,12 @@ func newQemuArch(config HypervisorConfig) (qemuArch, error) {
 
 	q := &qemuS390x{
 		qemuArchBase{
-			qemuMachine:           supportedQemuMachine,
-			qemuExePath:           defaultQemuPath,
-			memoryOffset:          config.MemOffset,
-			kernelParamsNonDebug:  kernelParamsNonDebug,
-			kernelParamsDebug:     kernelParamsDebug,
-			kernelParams:          kernelParams,
+			qemuMachine:          supportedQemuMachine,
+			qemuExePath:          defaultQemuPath,
+			memoryOffset:         config.MemOffset,
+			kernelParamsNonDebug: kernelParamsNonDebug,
+			kernelParamsDebug:    kernelParamsDebug,
+			kernelParams:         kernelParams,
 		},
 	}
 	// Set first bridge type to CCW