mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-30 20:54:26 +00:00
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>
This commit is contained in:
Peng Tao
parent
190f813427
commit
0153f76b07
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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"
|
||||
)
|
||||
|
||||
//
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -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 (
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -157,7 +157,6 @@ 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 {
|
||||
|
||||
@ -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
|
||||
@ -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
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// BalloonConfig struct for BalloonConfig
|
||||
type BalloonConfig struct {
|
||||
Size int64 `json:"size"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// CmdLineConfig struct for CmdLineConfig
|
||||
type CmdLineConfig struct {
|
||||
Args string `json:"args"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// ConsoleConfig struct for ConsoleConfig
|
||||
type ConsoleConfig struct {
|
||||
File string `json:"file,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// CpuTopology struct for CpuTopology
|
||||
type CpuTopology struct {
|
||||
ThreadsPerCore int32 `json:"threads_per_core,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// CpusConfig struct for CpusConfig
|
||||
type CpusConfig struct {
|
||||
BootVcpus int32 `json:"boot_vcpus"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// DeviceConfig struct for DeviceConfig
|
||||
type DeviceConfig struct {
|
||||
Path string `json:"path"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// DeviceNode struct for DeviceNode
|
||||
type DeviceNode struct {
|
||||
Id string `json:"id,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// DiskConfig struct for DiskConfig
|
||||
type DiskConfig struct {
|
||||
Path string `json:"path"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// FsConfig struct for FsConfig
|
||||
type FsConfig struct {
|
||||
Tag string `json:"tag"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// InitramfsConfig struct for InitramfsConfig
|
||||
type InitramfsConfig struct {
|
||||
Path string `json:"path"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// KernelConfig struct for KernelConfig
|
||||
type KernelConfig struct {
|
||||
Path string `json:"path"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// MemoryConfig struct for MemoryConfig
|
||||
type MemoryConfig struct {
|
||||
Size int64 `json:"size"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// MemoryZoneConfig struct for MemoryZoneConfig
|
||||
type MemoryZoneConfig struct {
|
||||
Id string `json:"id"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// NetConfig struct for NetConfig
|
||||
type NetConfig struct {
|
||||
Tap string `json:"tap,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// NumaConfig struct for NumaConfig
|
||||
type NumaConfig struct {
|
||||
GuestNumaId int32 `json:"guest_numa_id"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// NumaDistance struct for NumaDistance
|
||||
type NumaDistance struct {
|
||||
Destination int32 `json:"destination"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// PciDeviceInfo Information about a PCI device
|
||||
type PciDeviceInfo struct {
|
||||
Id string `json:"id"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// PmemConfig struct for PmemConfig
|
||||
type PmemConfig struct {
|
||||
File string `json:"file"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// RestoreConfig struct for RestoreConfig
|
||||
type RestoreConfig struct {
|
||||
SourceUrl string `json:"source_url"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// RngConfig struct for RngConfig
|
||||
type RngConfig struct {
|
||||
Src string `json:"src"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// SgxEpcConfig struct for SgxEpcConfig
|
||||
type SgxEpcConfig struct {
|
||||
Size int64 `json:"size"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmAddDevice struct for VmAddDevice
|
||||
type VmAddDevice struct {
|
||||
Path string `json:"path,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmConfig Virtual machine configuration
|
||||
type VmConfig struct {
|
||||
Cpus CpusConfig `json:"cpus,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmInfo Virtual Machine information
|
||||
type VmInfo struct {
|
||||
Config VmConfig `json:"config"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmRemoveDevice struct for VmRemoveDevice
|
||||
type VmRemoveDevice struct {
|
||||
Id string `json:"id,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmResize struct for VmResize
|
||||
type VmResize struct {
|
||||
DesiredVcpus int32 `json:"desired_vcpus,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmResizeZone struct for VmResizeZone
|
||||
type VmResizeZone struct {
|
||||
Id string `json:"id,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmSnapshotConfig struct for VmSnapshotConfig
|
||||
type VmSnapshotConfig struct {
|
||||
DestinationUrl string `json:"destination_url,omitempty"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VmmPingResponse Virtual Machine Monitor information
|
||||
type VmmPingResponse struct {
|
||||
Version string `json:"version"`
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
package openapi
|
||||
|
||||
// VsockConfig struct for VsockConfig
|
||||
type VsockConfig struct {
|
||||
// Guest Vsock CID
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user