forks/linsk
forks/linsk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor linting fixes

Browse source
This commit is contained in:
AlexSSD7 2023-09-01 18:15:32 +01:00
commit 153d1b5e1f
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/utils.go
View file

@ -33,7 +33,9 @@ func createStoreOrExit() *storage.Storage {
return store return store
} }
func runVM(passthroughArg string, fn func(context.Context, *vm.VM, *vm.FileManager, *share.NetTapRuntimeContext) int, forwardPortsRules []vm.PortForwardingRule, unrestrictedNetworking bool, withNetTap bool) int { type runVMFunc func(context.Context, *vm.VM, *vm.FileManager, *share.NetTapRuntimeContext) int
func runVM(passthroughArg string, fn runVMFunc, forwardPortsRules []vm.PortForwardingRule, unrestrictedNetworking bool, withNetTap bool) int {
store := createStoreOrExit() store := createStoreOrExit()
vmImagePath, err := store.CheckVMImageExists() vmImagePath, err := store.CheckVMImageExists()
@ -196,6 +198,10 @@ func runVM(passthroughArg string, fn func(context.Context, *vm.VM, *vm.FileManag
ShowDisplay: vmDebugFlag, ShowDisplay: vmDebugFlag,
} }
return innerRunVM(vmCfg, tapRuntimeCtx, fn)
}
func innerRunVM(vmCfg vm.VMConfig, tapRuntimeCtx *share.NetTapRuntimeContext, fn runVMFunc) int {
vi, err := vm.NewVM(slog.Default().With("caller", "vm"), vmCfg) vi, err := vm.NewVM(slog.Default().With("caller", "vm"), vmCfg)
if err != nil { if err != nil {
slog.Error("Failed to create vm instance", "error", err.Error()) slog.Error("Failed to create vm instance", "error", err.Error())

4
vm/net.go
View file

@ -11,7 +11,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
func (vi *VM) ConfigureInterfaceStaticNet(ctx context.Context, iface string, cidr string) error { func (vm *VM) ConfigureInterfaceStaticNet(ctx context.Context, iface string, cidr string) error {
ip, _, err := net.ParseCIDR(cidr) ip, _, err := net.ParseCIDR(cidr)
if err != nil { if err != nil {
return errors.Wrap(err, "invalid cidr") return errors.Wrap(err, "invalid cidr")
@ -21,7 +21,7 @@ func (vi *VM) ConfigureInterfaceStaticNet(ctx context.Context, iface string, cid
return fmt.Errorf("ipv6 addresses accepted only (have '%v')", ip) return fmt.Errorf("ipv6 addresses accepted only (have '%v')", ip)
} }
sc, err := vi.DialSSH() sc, err := vm.DialSSH()
if err != nil { if err != nil {
return errors.Wrap(err, "dial ssh") return errors.Wrap(err, "dial ssh")
} }