driver(internal): add blank imports and make changes to Lima for internal drivers

Signed-off-by: Ansuman Sahoo <[email protected]>

Author: unsuman

cmd/limactl/main.go

@@ -11,6 +11,7 @@ import (
 	"runtime"
 	"strings"
 
+	_ "github.com/lima-vm/lima/pkg/builtins" // register built-in drivers
 	"github.com/lima-vm/lima/pkg/debugutil"
 	"github.com/lima-vm/lima/pkg/fsutil"
 	"github.com/lima-vm/lima/pkg/osutil"

pkg/builtins/drivers.go

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package builtins
+
+import (
+	_ "github.com/lima-vm/lima/pkg/qemu"
+	_ "github.com/lima-vm/lima/pkg/vz"
+	_ "github.com/lima-vm/lima/pkg/wsl2"
+)

pkg/driver/driver.go

@@ -77,7 +77,7 @@ type Plugin interface {
 	Name() string
 
 	// NewDriver returns a new driver instance. Only to be used to embed internal drivers
-	NewDriver(inst *store.Instance, sshLocalPort int) Driver
+	SetConfig(inst *store.Instance, sshLocalPort int)
 }
 
 // Driver interface is used by hostagent for managing vm.
@@ -88,4 +88,7 @@ type Driver interface {
 	Registration
 	GuestAgent
 	Plugin
+
+	GetVSockPort() int
+	GetVirtioPort() string
 }

pkg/driverutil/instance.go

@@ -19,9 +19,11 @@ func CreateTargetDriverInstance(inst *store.Instance, sshLocalPort int) (driver.
 		return nil, fmt.Errorf("unknown or unsupported VM type: %s", *limaDriver)
 	}
 
+	driver.SetConfig(inst, sshLocalPort)
+
 	if err := driver.Validate(); err != nil {
 		return nil, fmt.Errorf("driver validation failed: %w", err)
 	}
 
-	return driver.NewDriver(inst, sshLocalPort), nil
+	return driver, nil
 }

pkg/hostagent/hostagent.go

@@ -136,8 +136,8 @@ func New(instName string, stdout io.Writer, signalCh chan os.Signal, opts ...Opt
 		return nil, fmt.Errorf("failed to create driver instance: %w", err)
 	}
 
-	var vSockPort int
-	var virtioPort string
+	vSockPort := limaDriver.GetVSockPort()
+	virtioPort := limaDriver.GetVirtioPort()
 
 	if err := cidata.GenerateCloudConfig(inst.Dir, instName, inst.Config); err != nil {
 		return nil, err

pkg/registry/registry.go

@@ -7,7 +7,6 @@ import (
 	"sync"
 
 	"github.com/lima-vm/lima/pkg/driver"
-	"github.com/lima-vm/lima/pkg/store"
 )
 
 type Registry struct {
@@ -21,18 +20,6 @@ func NewRegistry() *Registry {
 	}
 }
 
-func (r *Registry) Register(driver driver.Driver, inst *store.Instance, sshLocalPort int) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	name := driver.Name()
-	if _, exists := r.drivers[name]; exists {
-		return
-	}
-
-	r.drivers[name] = driver
-}
-
 func (r *Registry) List() []string {
 	r.mu.RLock()
 	defer r.mu.RUnlock()
@@ -54,6 +41,10 @@ func (r *Registry) Get(name string) (driver.Driver, bool) {
 
 var DefaultRegistry *Registry
 
+func init() {
+	DefaultRegistry = NewRegistry()
+}
+
 func Register(driver driver.Driver) {
 	if DefaultRegistry != nil {
 		name := driver.Name()