mirror of
https://github.com/containers/podman.git
synced 2025-11-29 09:37:38 +08:00
Vendor vfkit v0.5.1 and gopsutil v3.24.1
Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
14
vendor/github.com/crc-org/vfkit/pkg/config/bootloader.go
generated
vendored
14
vendor/github.com/crc-org/vfkit/pkg/config/bootloader.go
generated
vendored
@@ -52,7 +52,7 @@ func (bootloader *LinuxBootloader) FromOptions(options []option) error {
|
||||
case "initrd":
|
||||
bootloader.InitrdPath = option.value
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for linux bootloaders: %s", option.key)
|
||||
return fmt.Errorf("unknown option for linux bootloaders: %s", option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -61,17 +61,17 @@ func (bootloader *LinuxBootloader) FromOptions(options []option) error {
|
||||
func (bootloader *LinuxBootloader) ToCmdLine() ([]string, error) {
|
||||
args := []string{}
|
||||
if bootloader.VmlinuzPath == "" {
|
||||
return nil, fmt.Errorf("Missing kernel path")
|
||||
return nil, fmt.Errorf("missing kernel path")
|
||||
}
|
||||
args = append(args, "--kernel", bootloader.VmlinuzPath)
|
||||
|
||||
if bootloader.InitrdPath == "" {
|
||||
return nil, fmt.Errorf("Missing initrd path")
|
||||
return nil, fmt.Errorf("missing initrd path")
|
||||
}
|
||||
args = append(args, "--initrd", bootloader.InitrdPath)
|
||||
|
||||
if bootloader.KernelCmdLine == "" {
|
||||
return nil, fmt.Errorf("Missing kernel command line")
|
||||
return nil, fmt.Errorf("missing kernel command line")
|
||||
}
|
||||
args = append(args, "--kernel-cmdline", bootloader.KernelCmdLine)
|
||||
|
||||
@@ -95,11 +95,11 @@ func (bootloader *EFIBootloader) FromOptions(options []option) error {
|
||||
bootloader.EFIVariableStorePath = option.value
|
||||
case "create":
|
||||
if option.value != "" {
|
||||
return fmt.Errorf("Unexpected value for EFI bootloader 'create' option: %s", option.value)
|
||||
return fmt.Errorf("unexpected value for EFI bootloader 'create' option: %s", option.value)
|
||||
}
|
||||
bootloader.CreateVariableStore = true
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for EFI bootloaders: %s", option.key)
|
||||
return fmt.Errorf("unknown option for EFI bootloaders: %s", option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -107,7 +107,7 @@ func (bootloader *EFIBootloader) FromOptions(options []option) error {
|
||||
|
||||
func (bootloader *EFIBootloader) ToCmdLine() ([]string, error) {
|
||||
if bootloader.EFIVariableStorePath == "" {
|
||||
return nil, fmt.Errorf("Missing EFI store path")
|
||||
return nil, fmt.Errorf("missing EFI store path")
|
||||
}
|
||||
|
||||
builder := strings.Builder{}
|
||||
|
||||
4
vendor/github.com/crc-org/vfkit/pkg/config/config.go
generated
vendored
4
vendor/github.com/crc-org/vfkit/pkg/config/config.go
generated
vendored
@@ -189,12 +189,12 @@ func (ts *TimeSync) FromOptions(options []option) error {
|
||||
}
|
||||
ts.VsockPort = uint(vsockPort)
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for timesync parameter: %s", option.key)
|
||||
return fmt.Errorf("unknown option for timesync parameter: %s", option.key)
|
||||
}
|
||||
}
|
||||
|
||||
if ts.VsockPort == 0 {
|
||||
return fmt.Errorf("Missing 'vsockPort' option for timesync parameter")
|
||||
return fmt.Errorf("missing 'vsockPort' option for timesync parameter")
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
34
vendor/github.com/crc-org/vfkit/pkg/config/virtio.go
generated
vendored
34
vendor/github.com/crc-org/vfkit/pkg/config/virtio.go
generated
vendored
@@ -193,7 +193,7 @@ func (dev *VirtioSerial) validate() error {
|
||||
return fmt.Errorf("'logFilePath' and 'stdio' cannot be set at the same time")
|
||||
}
|
||||
if dev.LogFile == "" && !dev.UsesStdio {
|
||||
return fmt.Errorf("One of 'logFilePath' or 'stdio' must be set")
|
||||
return fmt.Errorf("one of 'logFilePath' or 'stdio' must be set")
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -217,11 +217,11 @@ func (dev *VirtioSerial) FromOptions(options []option) error {
|
||||
dev.LogFile = option.value
|
||||
case "stdio":
|
||||
if option.value != "" {
|
||||
return fmt.Errorf("Unexpected value for virtio-serial 'stdio' option: %s", option.value)
|
||||
return fmt.Errorf("unexpected value for virtio-serial 'stdio' option: %s", option.value)
|
||||
}
|
||||
dev.UsesStdio = true
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-serial devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-serial devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,7 +244,7 @@ func VirtioInputNew(inputType string) (VirtioDevice, error) {
|
||||
|
||||
func (dev *VirtioInput) validate() error {
|
||||
if dev.InputType != VirtioInputPointingDevice && dev.InputType != VirtioInputKeyboardDevice {
|
||||
return fmt.Errorf("Unknown option for virtio-input devices: %s", dev.InputType)
|
||||
return fmt.Errorf("unknown option for virtio-input devices: %s", dev.InputType)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -263,11 +263,11 @@ func (dev *VirtioInput) FromOptions(options []option) error {
|
||||
switch option.key {
|
||||
case VirtioInputPointingDevice, VirtioInputKeyboardDevice:
|
||||
if option.value != "" {
|
||||
return fmt.Errorf(fmt.Sprintf("Unexpected value for virtio-input %s option: %s", option.key, option.value))
|
||||
return fmt.Errorf(fmt.Sprintf("unexpected value for virtio-input %s option: %s", option.key, option.value))
|
||||
}
|
||||
dev.InputType = option.key
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-input devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-input devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
return dev.validate()
|
||||
@@ -288,7 +288,7 @@ func VirtioGPUNew() (VirtioDevice, error) {
|
||||
|
||||
func (dev *VirtioGPU) validate() error {
|
||||
if dev.Height < 1 || dev.Width < 1 {
|
||||
return fmt.Errorf("Invalid dimensions for virtio-gpu device resolution: %dx%d", dev.Width, dev.Height)
|
||||
return fmt.Errorf("invalid dimensions for virtio-gpu device resolution: %dx%d", dev.Width, dev.Height)
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -320,7 +320,7 @@ func (dev *VirtioGPU) FromOptions(options []option) error {
|
||||
|
||||
dev.Width = width
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-gpu devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-gpu devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -376,7 +376,7 @@ func (dev *VirtioNet) validate() error {
|
||||
return fmt.Errorf("'fd' and 'unixSocketPath' cannot be set at the same time")
|
||||
}
|
||||
if !dev.Nat && dev.Socket == nil && dev.UnixSocketPath == "" {
|
||||
return fmt.Errorf("One of 'nat' or 'fd' or 'unixSocketPath' must be set")
|
||||
return fmt.Errorf("one of 'nat' or 'fd' or 'unixSocketPath' must be set")
|
||||
}
|
||||
|
||||
return nil
|
||||
@@ -410,7 +410,7 @@ func (dev *VirtioNet) FromOptions(options []option) error {
|
||||
switch option.key {
|
||||
case "nat":
|
||||
if option.value != "" {
|
||||
return fmt.Errorf("Unexpected value for virtio-net 'nat' option: %s", option.value)
|
||||
return fmt.Errorf("unexpected value for virtio-net 'nat' option: %s", option.value)
|
||||
}
|
||||
dev.Nat = true
|
||||
case "mac":
|
||||
@@ -428,7 +428,7 @@ func (dev *VirtioNet) FromOptions(options []option) error {
|
||||
case "unixSocketPath":
|
||||
dev.UnixSocketPath = option.value
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-net devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-net devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -447,7 +447,7 @@ func (dev *VirtioRng) ToCmdLine() ([]string, error) {
|
||||
|
||||
func (dev *VirtioRng) FromOptions(options []option) error {
|
||||
if len(options) != 0 {
|
||||
return fmt.Errorf("Unknown options for virtio-rng devices: %s", options)
|
||||
return fmt.Errorf("unknown options for virtio-rng devices: %s", options)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -494,7 +494,7 @@ func (dev *VirtioBlk) ToCmdLine() ([]string, error) {
|
||||
return []string{}, err
|
||||
}
|
||||
if len(cmdLine) != 2 {
|
||||
return []string{}, fmt.Errorf("Unexpected storage config commandline")
|
||||
return []string{}, fmt.Errorf("unexpected storage config commandline")
|
||||
}
|
||||
if dev.DeviceIdentifier != "" {
|
||||
cmdLine[1] = fmt.Sprintf("%s,deviceId=%s", cmdLine[1], dev.DeviceIdentifier)
|
||||
@@ -546,7 +546,7 @@ func (dev *VirtioVsock) FromOptions(options []option) error {
|
||||
case "connect":
|
||||
dev.Listen = false
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-vsock devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-vsock devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -583,7 +583,7 @@ func (dev *VirtioFs) FromOptions(options []option) error {
|
||||
case "mountTag":
|
||||
dev.MountTag = option.value
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for virtio-fs devices: %s", option.key)
|
||||
return fmt.Errorf("unknown option for virtio-fs devices: %s", option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -623,7 +623,7 @@ func (dev *RosettaShare) FromOptions(options []option) error {
|
||||
case "install":
|
||||
dev.InstallRosetta = true
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for rosetta share: %s", option.key)
|
||||
return fmt.Errorf("unknown option for rosetta share: %s", option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
@@ -670,7 +670,7 @@ func (config *StorageConfig) FromOptions(options []option) error {
|
||||
case "path":
|
||||
config.ImagePath = option.value
|
||||
default:
|
||||
return fmt.Errorf("Unknown option for %s devices: %s", config.DevName, option.key)
|
||||
return fmt.Errorf("unknown option for %s devices: %s", config.DevName, option.key)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user