Merge pull request #3428 from arixmkii/driver-negotiate-transport

Allow drivers to negotiate transport independent of hostagent

Author: AkihiroSuda

pkg/hostagent/hostagent.go

@@ -123,20 +123,13 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt
 		}
 	}
 
-	vSockPort := 0
-	virtioPort := ""
-	if *inst.Config.VMType == limayaml.VZ {
-		vSockPort = 2222
-	} else if *inst.Config.VMType == limayaml.WSL2 {
-		port, err := freeport.VSock()
-		if err != nil {
-			logrus.WithError(err).Error("failed to get free VSock port")
-		}
-		vSockPort = port
-	} else if *inst.Config.VMType == limayaml.QEMU {
-		// virtserialport doesn't seem to work reliably: https://github.com/lima-vm/lima/issues/2064
-		virtioPort = "" // filenames.VirtioPort
+	baseDriver := driver.BaseDriver{
+		Instance:     inst,
+		SSHLocalPort: sshLocalPort,
 	}
+	limaDriver := driverutil.CreateTargetDriverInstance(&baseDriver)
+	vSockPort := baseDriver.VSockPort
+	virtioPort := baseDriver.VirtioPort
 
 	if err := cidata.GenerateCloudConfig(inst.Dir, instName, inst.Config); err != nil {
 		return nil, err
@@ -196,13 +189,6 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt
 	limayaml.FillPortForwardDefaults(&rule, inst.Dir, inst.Config.User, inst.Param)
 	rules = append(rules, rule)
 
-	limaDriver := driverutil.CreateTargetDriverInstance(&driver.BaseDriver{
-		Instance:     inst,
-		SSHLocalPort: sshLocalPort,
-		VSockPort:    vSockPort,
-		VirtioPort:   virtioPort,
-	})
-
 	a := &HostAgent{
 		instConfig:        inst.Config,
 		sshLocalPort:      sshLocalPort,

pkg/qemu/qemu_driver.go

@@ -41,6 +41,13 @@ type LimaQemuDriver struct {
 }
 
 func New(driver *driver.BaseDriver) *LimaQemuDriver {
+	driver.VSockPort = 0
+	driver.VirtioPort = filenames.VirtioPort
+	// virtserialport doesn't seem to work reliably: https://github.com/lima-vm/lima/issues/2064
+	// but on Windows default Unix socket forwarding is not available
+	if runtime.GOOS != "windows" {
+		driver.VirtioPort = ""
+	}
 	return &LimaQemuDriver{
 		BaseDriver: driver,
 	}

pkg/vz/vz_driver_darwin.go

@@ -72,6 +72,8 @@ type LimaVzDriver struct {
 }
 
 func New(driver *driver.BaseDriver) *LimaVzDriver {
+	driver.VSockPort = 2222
+	driver.VirtioPort = ""
 	return &LimaVzDriver{
 		BaseDriver: driver,
 	}

pkg/wsl2/wsl_driver_windows.go

@@ -12,6 +12,7 @@ import (
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/go-winio/pkg/guid"
 	"github.com/lima-vm/lima/pkg/driver"
+	"github.com/lima-vm/lima/pkg/freeport"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/lima-vm/lima/pkg/reflectutil"
 	"github.com/lima-vm/lima/pkg/store"
@@ -49,6 +50,12 @@ type LimaWslDriver struct {
 }
 
 func New(driver *driver.BaseDriver) *LimaWslDriver {
+	port, err := freeport.VSock()
+	if err != nil {
+		logrus.WithError(err).Error("failed to get free VSock port")
+	}
+	driver.VSockPort = port
+	driver.VirtioPort = ""
 	return &LimaWslDriver{
 		BaseDriver: driver,
 	}