runtime: gofmt code

Looks like we have merged a lot of code that is not properly formated.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>

src/runtime/virtcontainers/acrn.go

@@ -25,10 +25,10 @@ import (
 
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config"
 	persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api"
+	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
-	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 )
 
 // Since ACRN is using the store in a quite abnormal way, let's first draw it back from store to here

src/runtime/virtcontainers/agent.go

@@ -206,7 +206,7 @@ type agent interface {
 
 	// getOOMEvent will wait on OOM events that occur in the sandbox.
 	// Will return the ID of the container where the event occurred.
-	getOOMEvent(ctx context.Context, ) (string, error)
+	getOOMEvent(ctx context.Context) (string, error)
 
 	// getAgentMetrics get metrics of agent and guest through agent
 	getAgentMetrics(context.Context, *grpc.GetMetricsRequest) (*grpc.Metrics, error)

src/runtime/virtcontainers/clh.go

@@ -30,9 +30,9 @@ import (
 	otelTrace "go.opentelemetry.io/otel/trace"
 
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config"
+	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
-	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 )
 
 //

src/runtime/virtcontainers/device/config/config.go

@@ -15,8 +15,8 @@ import (
 	"strings"
 
 	"github.com/go-ini/ini"
-	"golang.org/x/sys/unix"
 	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+	"golang.org/x/sys/unix"
 )
 
 // DeviceType indicates device type

src/runtime/virtcontainers/factory/factory.go

@@ -191,7 +191,7 @@ func (f *factory) GetVM(ctx context.Context, config vc.VMConfig) (*vc.VM, error)
 	online := false
 	baseConfig := f.base.Config().HypervisorConfig
 	if baseConfig.NumVCPUs < hypervisorConfig.NumVCPUs {
-		err = vm.AddCPUs(ctx, hypervisorConfig.NumVCPUs - baseConfig.NumVCPUs)
+		err = vm.AddCPUs(ctx, hypervisorConfig.NumVCPUs-baseConfig.NumVCPUs)
 		if err != nil {
 			return nil, err
 		}
@@ -199,7 +199,7 @@ func (f *factory) GetVM(ctx context.Context, config vc.VMConfig) (*vc.VM, error)
 	}
 
 	if baseConfig.MemorySize < hypervisorConfig.MemorySize {
-		err = vm.AddMemory(ctx, hypervisorConfig.MemorySize - baseConfig.MemorySize)
+		err = vm.AddMemory(ctx, hypervisorConfig.MemorySize-baseConfig.MemorySize)
 		if err != nil {
 			return nil, err
 		}

src/runtime/virtcontainers/kata_agent_test.go

@@ -31,8 +31,8 @@ import (
 	vcAnnotations "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/annotations"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/mock"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless"
-	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 )
 
 var (

src/runtime/virtcontainers/persist/api/device.go

@@ -6,7 +6,7 @@
 
 package persistapi
 
-import	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+import vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 
 // ============= sandbox level resources =============
 

src/runtime/virtcontainers/physical_endpoint.go

@@ -17,8 +17,8 @@ import (
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/drivers"
 	persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/cgroups"
-	"github.com/safchain/ethtool"
 	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+	"github.com/safchain/ethtool"
 )
 
 // PhysicalEndpoint gathers a physical network interface and its properties

src/runtime/virtcontainers/pkg/agent/protocols/grpc/agent.pb.go

@@ -7248,7 +7248,7 @@ func (this *MemoryStats) String() string {
 		return "nil"
 	}
 	keysForStats := make([]string, 0, len(this.Stats))
-	for k, _ := range this.Stats {
+	for k := range this.Stats {
 		keysForStats = append(keysForStats, k)
 	}
 	github_com_gogo_protobuf_sortkeys.Strings(keysForStats)
@@ -7359,7 +7359,7 @@ func (this *CgroupStats) String() string {
 		return "nil"
 	}
 	keysForHugetlbStats := make([]string, 0, len(this.HugetlbStats))
-	for k, _ := range this.HugetlbStats {
+	for k := range this.HugetlbStats {
 		keysForHugetlbStats = append(keysForHugetlbStats, k)
 	}
 	github_com_gogo_protobuf_sortkeys.Strings(keysForHugetlbStats)

src/runtime/virtcontainers/pkg/agent/protocols/grpc/oci.pb.go

@@ -6653,7 +6653,7 @@ func (this *Spec) String() string {
 	}
 	repeatedStringForMounts += "}"
 	keysForAnnotations := make([]string, 0, len(this.Annotations))
-	for k, _ := range this.Annotations {
+	for k := range this.Annotations {
 		keysForAnnotations = append(keysForAnnotations, k)
 	}
 	github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
@@ -6852,7 +6852,7 @@ func (this *Linux) String() string {
 	}
 	repeatedStringForDevices += "}"
 	keysForSysctl := make([]string, 0, len(this.Sysctl))
-	for k, _ := range this.Sysctl {
+	for k := range this.Sysctl {
 		keysForSysctl = append(keysForSysctl, k)
 	}
 	github_com_gogo_protobuf_sortkeys.Strings(keysForSysctl)

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/client.go

@@ -157,13 +157,12 @@ func parameterToJson(obj interface{}) (string, error) {
 	return string(jsonBuf), err
 }
 
-
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
 	if c.cfg.Debug {
-	        dump, err := httputil.DumpRequestOut(request, true)
+		dump, err := httputil.DumpRequestOut(request, true)
 		if err != nil {
-		        return nil, err
+			return nil, err
 		}
 		log.Printf("\n%s\n", string(dump))
 	}

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/configuration.go

@@ -37,7 +37,6 @@ var (
 
 	// ContextAPIKey takes an APIKey as authentication for the request
 	ContextAPIKey = contextKey("apikey")
-
 )
 
 // BasicAuth provides basic http authentication to a request passed via context using ContextBasicAuth
@@ -52,7 +51,6 @@ type APIKey struct {
 	Prefix string
 }
 
-
 // ServerVariable stores the information about a server variable
 type ServerVariable struct {
 	Description  string
@@ -62,9 +60,9 @@ type ServerVariable struct {
 
 // ServerConfiguration stores the information about a server
 type ServerConfiguration struct {
-	Url string
+	Url         string
 	Description string
-	Variables map[string]ServerVariable
+	Variables   map[string]ServerVariable
 }
 
 // Configuration stores the configuration of the API client
@@ -86,9 +84,9 @@ func NewConfiguration() *Configuration {
 		DefaultHeader: make(map[string]string),
 		UserAgent:     "OpenAPI-Generator/1.0.0/go",
 		Debug:         false,
-		Servers:       []ServerConfiguration{
+		Servers: []ServerConfiguration{
 			{
-				Url: "http://localhost/api/v1",
+				Url:         "http://localhost/api/v1",
 				Description: "No description provided",
 			},
 		},
@@ -104,7 +102,7 @@ func (c *Configuration) AddDefaultHeader(key string, value string) {
 // ServerUrl returns URL based on server settings
 func (c *Configuration) ServerUrl(index int, variables map[string]string) (string, error) {
 	if index < 0 || len(c.Servers) <= index {
-		return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers) - 1)
+		return "", fmt.Errorf("Index %v out of range %v", index, len(c.Servers)-1)
 	}
 	server := c.Servers[index]
 	url := server.Url

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_balloon_config.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // BalloonConfig struct for BalloonConfig
 type BalloonConfig struct {
 	Size int64 `json:"size"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cmd_line_config.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // CmdLineConfig struct for CmdLineConfig
 type CmdLineConfig struct {
 	Args string `json:"args"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_console_config.go

@@ -8,9 +8,10 @@
  */
 
 package openapi
+
 // ConsoleConfig struct for ConsoleConfig
 type ConsoleConfig struct {
-	File string `json:"file,omitempty"`
+	File  string `json:"file,omitempty"`
-	Mode string `json:"mode"`
+	Mode  string `json:"mode"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu bool   `json:"iommu,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpu_topology.go

@@ -8,10 +8,11 @@
  */
 
 package openapi
+
 // CpuTopology struct for CpuTopology
 type CpuTopology struct {
 	ThreadsPerCore int32 `json:"threads_per_core,omitempty"`
-	CoresPerDie int32 `json:"cores_per_die,omitempty"`
+	CoresPerDie    int32 `json:"cores_per_die,omitempty"`
 	DiesPerPackage int32 `json:"dies_per_package,omitempty"`
-	Packages int32 `json:"packages,omitempty"`
+	Packages       int32 `json:"packages,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_cpus_config.go

@@ -8,10 +8,11 @@
  */
 
 package openapi
+
 // CpusConfig struct for CpusConfig
 type CpusConfig struct {
-	BootVcpus int32 `json:"boot_vcpus"`
+	BootVcpus   int32       `json:"boot_vcpus"`
-	MaxVcpus int32 `json:"max_vcpus"`
+	MaxVcpus    int32       `json:"max_vcpus"`
-	Topology CpuTopology `json:"topology,omitempty"`
+	Topology    CpuTopology `json:"topology,omitempty"`
-	MaxPhysBits int32 `json:"max_phys_bits,omitempty"`
+	MaxPhysBits int32       `json:"max_phys_bits,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_config.go

@@ -8,9 +8,10 @@
  */
 
 package openapi
+
 // DeviceConfig struct for DeviceConfig
 type DeviceConfig struct {
-	Path string `json:"path"`
+	Path  string `json:"path"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu bool   `json:"iommu,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id    string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_device_node.go

@@ -8,10 +8,11 @@
  */
 
 package openapi
+
 // DeviceNode struct for DeviceNode
 type DeviceNode struct {
-	Id string `json:"id,omitempty"`
+	Id        string                   `json:"id,omitempty"`
 	Resources []map[string]interface{} `json:"resources,omitempty"`
-	Children []string `json:"children,omitempty"`
+	Children  []string                 `json:"children,omitempty"`
-	PciBdf int32 `json:"pci_bdf,omitempty"`
+	PciBdf    int32                    `json:"pci_bdf,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_disk_config.go

@@ -8,16 +8,17 @@
  */
 
 package openapi
+
 // DiskConfig struct for DiskConfig
 type DiskConfig struct {
-	Path string `json:"path"`
+	Path        string `json:"path"`
-	Readonly bool `json:"readonly,omitempty"`
+	Readonly    bool   `json:"readonly,omitempty"`
-	Direct bool `json:"direct,omitempty"`
+	Direct      bool   `json:"direct,omitempty"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu       bool   `json:"iommu,omitempty"`
-	NumQueues int32 `json:"num_queues,omitempty"`
+	NumQueues   int32  `json:"num_queues,omitempty"`
-	QueueSize int32 `json:"queue_size,omitempty"`
+	QueueSize   int32  `json:"queue_size,omitempty"`
-	VhostUser bool `json:"vhost_user,omitempty"`
+	VhostUser   bool   `json:"vhost_user,omitempty"`
 	VhostSocket string `json:"vhost_socket,omitempty"`
-	PollQueue bool `json:"poll_queue,omitempty"`
+	PollQueue   bool   `json:"poll_queue,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id          string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go

@@ -8,13 +8,14 @@
  */
 
 package openapi
+
 // FsConfig struct for FsConfig
 type FsConfig struct {
-	Tag string `json:"tag"`
+	Tag       string `json:"tag"`
-	Socket string `json:"socket"`
+	Socket    string `json:"socket"`
-	NumQueues int32 `json:"num_queues"`
+	NumQueues int32  `json:"num_queues"`
-	QueueSize int32 `json:"queue_size"`
+	QueueSize int32  `json:"queue_size"`
-	Dax bool `json:"dax"`
+	Dax       bool   `json:"dax"`
-	CacheSize int64 `json:"cache_size"`
+	CacheSize int64  `json:"cache_size"`
-	Id string `json:"id,omitempty"`
+	Id        string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_initramfs_config.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // InitramfsConfig struct for InitramfsConfig
 type InitramfsConfig struct {
 	Path string `json:"path"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_kernel_config.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // KernelConfig struct for KernelConfig
 type KernelConfig struct {
 	Path string `json:"path"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_config.go

@@ -8,14 +8,15 @@
  */
 
 package openapi
+
 // MemoryConfig struct for MemoryConfig
 type MemoryConfig struct {
-	Size int64 `json:"size"`
+	Size           int64              `json:"size"`
-	HotplugSize int64 `json:"hotplug_size,omitempty"`
+	HotplugSize    int64              `json:"hotplug_size,omitempty"`
-	HotpluggedSize int64 `json:"hotplugged_size,omitempty"`
+	HotpluggedSize int64              `json:"hotplugged_size,omitempty"`
-	Mergeable bool `json:"mergeable,omitempty"`
+	Mergeable      bool               `json:"mergeable,omitempty"`
-	HotplugMethod string `json:"hotplug_method,omitempty"`
+	HotplugMethod  string             `json:"hotplug_method,omitempty"`
-	Shared bool `json:"shared,omitempty"`
+	Shared         bool               `json:"shared,omitempty"`
-	Hugepages bool `json:"hugepages,omitempty"`
+	Hugepages      bool               `json:"hugepages,omitempty"`
-	Zones []MemoryZoneConfig `json:"zones,omitempty"`
+	Zones          []MemoryZoneConfig `json:"zones,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_memory_zone_config.go

@@ -8,15 +8,16 @@
  */
 
 package openapi
+
 // MemoryZoneConfig struct for MemoryZoneConfig
 type MemoryZoneConfig struct {
-	Id string `json:"id"`
+	Id             string `json:"id"`
-	Size int64 `json:"size"`
+	Size           int64  `json:"size"`
-	File string `json:"file,omitempty"`
+	File           string `json:"file,omitempty"`
-	Mergeable bool `json:"mergeable,omitempty"`
+	Mergeable      bool   `json:"mergeable,omitempty"`
-	Shared bool `json:"shared,omitempty"`
+	Shared         bool   `json:"shared,omitempty"`
-	Hugepages bool `json:"hugepages,omitempty"`
+	Hugepages      bool   `json:"hugepages,omitempty"`
-	HostNumaNode int32 `json:"host_numa_node,omitempty"`
+	HostNumaNode   int32  `json:"host_numa_node,omitempty"`
-	HotplugSize int64 `json:"hotplug_size,omitempty"`
+	HotplugSize    int64  `json:"hotplug_size,omitempty"`
-	HotpluggedSize int64 `json:"hotplugged_size,omitempty"`
+	HotpluggedSize int64  `json:"hotplugged_size,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_net_config.go

@@ -8,16 +8,17 @@
  */
 
 package openapi
+
 // NetConfig struct for NetConfig
 type NetConfig struct {
-	Tap string `json:"tap,omitempty"`
+	Tap         string `json:"tap,omitempty"`
-	Ip string `json:"ip,omitempty"`
+	Ip          string `json:"ip,omitempty"`
-	Mask string `json:"mask,omitempty"`
+	Mask        string `json:"mask,omitempty"`
-	Mac string `json:"mac,omitempty"`
+	Mac         string `json:"mac,omitempty"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu       bool   `json:"iommu,omitempty"`
-	NumQueues int32 `json:"num_queues,omitempty"`
+	NumQueues   int32  `json:"num_queues,omitempty"`
-	QueueSize int32 `json:"queue_size,omitempty"`
+	QueueSize   int32  `json:"queue_size,omitempty"`
-	VhostUser bool `json:"vhost_user,omitempty"`
+	VhostUser   bool   `json:"vhost_user,omitempty"`
 	VhostSocket string `json:"vhost_socket,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id          string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_config.go

@@ -8,10 +8,11 @@
  */
 
 package openapi
+
 // NumaConfig struct for NumaConfig
 type NumaConfig struct {
-	GuestNumaId int32 `json:"guest_numa_id"`
+	GuestNumaId int32          `json:"guest_numa_id"`
-	Cpus []int32 `json:"cpus,omitempty"`
+	Cpus        []int32        `json:"cpus,omitempty"`
-	Distances []NumaDistance `json:"distances,omitempty"`
+	Distances   []NumaDistance `json:"distances,omitempty"`
-	MemoryZones []string `json:"memory_zones,omitempty"`
+	MemoryZones []string       `json:"memory_zones,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_numa_distance.go

@@ -8,8 +8,9 @@
  */
 
 package openapi
+
 // NumaDistance struct for NumaDistance
 type NumaDistance struct {
 	Destination int32 `json:"destination"`
-	Distance int32 `json:"distance"`
+	Distance    int32 `json:"distance"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pci_device_info.go

@@ -8,8 +8,9 @@
  */
 
 package openapi
+
 // PciDeviceInfo Information about a PCI device
 type PciDeviceInfo struct {
-	Id string `json:"id"`
+	Id  string `json:"id"`
 	Bdf string `json:"bdf"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_pmem_config.go

@@ -8,12 +8,13 @@
  */
 
 package openapi
+
 // PmemConfig struct for PmemConfig
 type PmemConfig struct {
-	File string `json:"file"`
+	File          string `json:"file"`
-	Size int64 `json:"size,omitempty"`
+	Size          int64  `json:"size,omitempty"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu         bool   `json:"iommu,omitempty"`
-	Mergeable bool `json:"mergeable,omitempty"`
+	Mergeable     bool   `json:"mergeable,omitempty"`
-	DiscardWrites bool `json:"discard_writes,omitempty"`
+	DiscardWrites bool   `json:"discard_writes,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id            string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_restore_config.go

@@ -8,8 +8,9 @@
  */
 
 package openapi
+
 // RestoreConfig struct for RestoreConfig
 type RestoreConfig struct {
 	SourceUrl string `json:"source_url"`
-	Prefault bool `json:"prefault,omitempty"`
+	Prefault  bool   `json:"prefault,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_rng_config.go

@@ -8,8 +8,9 @@
  */
 
 package openapi
+
 // RngConfig struct for RngConfig
 type RngConfig struct {
-	Src string `json:"src"`
+	Src   string `json:"src"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu bool   `json:"iommu,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_sgx_epc_config.go

@@ -8,8 +8,9 @@
  */
 
 package openapi
+
 // SgxEpcConfig struct for SgxEpcConfig
 type SgxEpcConfig struct {
-	Size int64 `json:"size"`
+	Size     int64 `json:"size"`
-	Prefault bool `json:"prefault,omitempty"`
+	Prefault bool  `json:"prefault,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_add_device.go

@@ -8,9 +8,10 @@
  */
 
 package openapi
+
 // VmAddDevice struct for VmAddDevice
 type VmAddDevice struct {
-	Path string `json:"path,omitempty"`
+	Path  string `json:"path,omitempty"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu bool   `json:"iommu,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id    string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_config.go

@@ -8,25 +8,26 @@
  */
 
 package openapi
+
 // VmConfig Virtual machine configuration
 type VmConfig struct {
-	Cpus CpusConfig `json:"cpus,omitempty"`
+	Cpus      CpusConfig       `json:"cpus,omitempty"`
-	Memory MemoryConfig `json:"memory,omitempty"`
+	Memory    MemoryConfig     `json:"memory,omitempty"`
-	Kernel KernelConfig `json:"kernel"`
+	Kernel    KernelConfig     `json:"kernel"`
 	Initramfs *InitramfsConfig `json:"initramfs,omitempty"`
-	Cmdline CmdLineConfig `json:"cmdline,omitempty"`
+	Cmdline   CmdLineConfig    `json:"cmdline,omitempty"`
-	Disks []DiskConfig `json:"disks,omitempty"`
+	Disks     []DiskConfig     `json:"disks,omitempty"`
-	Net []NetConfig `json:"net,omitempty"`
+	Net       []NetConfig      `json:"net,omitempty"`
-	Rng RngConfig `json:"rng,omitempty"`
+	Rng       RngConfig        `json:"rng,omitempty"`
-	Balloon BalloonConfig `json:"balloon,omitempty"`
+	Balloon   BalloonConfig    `json:"balloon,omitempty"`
-	Fs []FsConfig `json:"fs,omitempty"`
+	Fs        []FsConfig       `json:"fs,omitempty"`
-	Pmem []PmemConfig `json:"pmem,omitempty"`
+	Pmem      []PmemConfig     `json:"pmem,omitempty"`
-	Serial ConsoleConfig `json:"serial,omitempty"`
+	Serial    ConsoleConfig    `json:"serial,omitempty"`
-	Console ConsoleConfig `json:"console,omitempty"`
+	Console   ConsoleConfig    `json:"console,omitempty"`
-	Devices []DeviceConfig `json:"devices,omitempty"`
+	Devices   []DeviceConfig   `json:"devices,omitempty"`
-	Vsock VsockConfig `json:"vsock,omitempty"`
+	Vsock     VsockConfig      `json:"vsock,omitempty"`
-	SgxEpc []SgxEpcConfig `json:"sgx_epc,omitempty"`
+	SgxEpc    []SgxEpcConfig   `json:"sgx_epc,omitempty"`
-	Numa []NumaConfig `json:"numa,omitempty"`
+	Numa      []NumaConfig     `json:"numa,omitempty"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu     bool             `json:"iommu,omitempty"`
-	Watchdog bool `json:"watchdog,omitempty"`
+	Watchdog  bool             `json:"watchdog,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_info.go

@@ -8,10 +8,11 @@
  */
 
 package openapi
+
 // VmInfo Virtual Machine information
 type VmInfo struct {
-	Config VmConfig `json:"config"`
+	Config           VmConfig              `json:"config"`
-	State string `json:"state"`
+	State            string                `json:"state"`
-	MemoryActualSize int64 `json:"memory_actual_size,omitempty"`
+	MemoryActualSize int64                 `json:"memory_actual_size,omitempty"`
-	DeviceTree map[string]DeviceNode `json:"device_tree,omitempty"`
+	DeviceTree       map[string]DeviceNode `json:"device_tree,omitempty"`
 }

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_remove_device.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // VmRemoveDevice struct for VmRemoveDevice
 type VmRemoveDevice struct {
 	Id string `json:"id,omitempty"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_resize.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // VmResize struct for VmResize
 type VmResize struct {
 	DesiredVcpus int32 `json:"desired_vcpus,omitempty"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_resize_zone.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // VmResizeZone struct for VmResizeZone
 type VmResizeZone struct {
 	Id string `json:"id,omitempty"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vm_snapshot_config.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // VmSnapshotConfig struct for VmSnapshotConfig
 type VmSnapshotConfig struct {
 	DestinationUrl string `json:"destination_url,omitempty"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vmm_ping_response.go

@@ -8,6 +8,7 @@
  */
 
 package openapi
+
 // VmmPingResponse Virtual Machine Monitor information
 type VmmPingResponse struct {
 	Version string `json:"version"`

src/runtime/virtcontainers/pkg/cloud-hypervisor/client/model_vsock_config.go

@@ -8,12 +8,13 @@
  */
 
 package openapi
+
 // VsockConfig struct for VsockConfig
 type VsockConfig struct {
 	// Guest Vsock CID
 	Cid int64 `json:"cid"`
 	// Path to UNIX domain socket, used to proxy vsock connections.
 	Socket string `json:"socket"`
-	Iommu bool `json:"iommu,omitempty"`
+	Iommu  bool   `json:"iommu,omitempty"`
-	Id string `json:"id,omitempty"`
+	Id     string `json:"id,omitempty"`
 }

src/runtime/virtcontainers/qemu.go

@@ -36,10 +36,10 @@ import (
 	pkgUtils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config"
 	persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api"
+	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
-	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
 )
 
 // romFile is the file name of the ROM that can be used for virtio-pci devices.

src/runtime/virtcontainers/qemu_arch_base.go

@@ -157,7 +157,7 @@ type qemuArchBase struct {
 	kernelParamsDebug    []Param
 	kernelParams         []Param
 	Bridges              []types.Bridge
-	PFlash		     []string
+	PFlash               []string
 }
 
 const (

src/runtime/virtcontainers/tap_endpoint.go

@@ -13,8 +13,8 @@ import (
 	"github.com/vishvananda/netlink"
 
 	persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api"
-	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid"
 	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid"
 )
 
 // TapEndpoint represents just a tap endpoint

src/runtime/virtcontainers/vhostuser_endpoint.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/config"
 	persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api"
-	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
 	vcTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/types"
+	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
 )
 
 // Long term, this should be made more configurable.  For now matching path