Merge pull request #1968 from AkihiroSuda/vz-trivials

vz: trivial changes

Author: AkihiroSuda

cmd/limactl/factory-reset.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -45,7 +46,7 @@ func factoryResetAction(_ *cobra.Command, args []string) error {
 	}
 	for _, f := range fi {
 		path := filepath.Join(inst.Dir, f.Name())
-		if !strings.HasSuffix(path, ".yaml") && !strings.HasSuffix(path, ".yml") {
+		if !strings.HasSuffix(path, ".yaml") && !strings.HasSuffix(path, ".yml") && f.Name() != filenames.VzIdentifier {
 			logrus.Infof("Removing %q", path)
 			if err := os.Remove(path); err != nil {
 				logrus.Error(err)

pkg/driver/driver.go

@@ -16,6 +16,14 @@ type Driver interface {
 	// Validate returns error if the current driver isn't support for given config
 	Validate() error
 
+	// Initialize is called on creating the instance for initialization.
+	// (e.g., creating "vz-identifier" file)
+	//
+	// Initialize MUST return nil when it is called against an existing instance.
+	//
+	// Initialize does not create the disks.
+	Initialize(_ context.Context) error
+
 	// CreateDisk returns error if the current driver fails in creating disk
 	CreateDisk() error
 
@@ -69,6 +77,10 @@ func (d *BaseDriver) Validate() error {
 	return nil
 }
 
+func (d *BaseDriver) Initialize(_ context.Context) error {
+	return nil
+}
+
 func (d *BaseDriver) CreateDisk() error {
 	return nil
 }

pkg/osutil/osversion_darwin.go

@@ -0,0 +1,29 @@
+package osutil
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+
+	"github.com/coreos/go-semver/semver"
+)
+
+// ProductVersion returns the macOS product version like "12.3.1".
+func ProductVersion() (*semver.Version, error) {
+	cmd := exec.Command("sw_vers", "-productVersion")
+	// output is like "12.3.1\n"
+	b, err := cmd.Output()
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute %v: %w", cmd.Args, err)
+	}
+	verTrimmed := strings.TrimSpace(string(b))
+	// macOS 12.4 returns just "12.4\n"
+	for strings.Count(verTrimmed, ".") < 2 {
+		verTrimmed += ".0"
+	}
+	verSem, err := semver.NewVersion(verTrimmed)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse macOS version %q: %w", verTrimmed, err)
+	}
+	return verSem, nil
+}

pkg/osutil/osversion_others.go

@@ -0,0 +1,14 @@
+//go:build !darwin
+
+package osutil
+
+import (
+	"errors"
+
+	"github.com/coreos/go-semver/semver"
+)
+
+// ProductVersion returns the OS product version, not the kernel version.
+func ProductVersion() (*semver.Version, error) {
+	return nil, errors.New("not implemented")
+}

pkg/qemu/qemu.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/lima-vm/lima/pkg/networks/usernet"
+	"github.com/lima-vm/lima/pkg/osutil"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/digitalocean/go-qemu/qmp"
@@ -398,25 +399,6 @@ func showDarwinARM64HVFQEMU620Warning(exe, accel string, features *features) {
 	logrus.Warn(w)
 }
 
-func getMacOSProductVersion() (*semver.Version, error) {
-	cmd := exec.Command("sw_vers", "-productVersion")
-	// output is like "12.3.1\n"
-	b, err := cmd.Output()
-	if err != nil {
-		return nil, fmt.Errorf("failed to execute %v: %w", cmd.Args, err)
-	}
-	verTrimmed := strings.TrimSpace(string(b))
-	// macOS 12.4 returns just "12.4\n"
-	for strings.Count(verTrimmed, ".") < 2 {
-		verTrimmed += ".0"
-	}
-	verSem, err := semver.NewVersion(verTrimmed)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse macOS version %q: %w", verTrimmed, err)
-	}
-	return verSem, nil
-}
-
 // adjustMemBytesDarwinARM64HVF adjusts the memory to be <= 3 GiB, only when the following conditions are met:
 //
 // - Host OS   <  macOS 12.4
@@ -443,7 +425,7 @@ func adjustMemBytesDarwinARM64HVF(memBytes int64, accel string, features *featur
 	if !features.VersionGEQ7 {
 		return memBytes
 	}
-	macOSProductVersion, err := getMacOSProductVersion()
+	macOSProductVersion, err := osutil.ProductVersion()
 	if err != nil {
 		logrus.Warn(err)
 		return memBytes

pkg/start/start.go

@@ -72,7 +72,7 @@ type Prepared struct {
 }
 
 // Prepare ensures the disk, the nerdctl archive, etc.
-func Prepare(_ context.Context, inst *store.Instance) (*Prepared, error) {
+func Prepare(ctx context.Context, inst *store.Instance) (*Prepared, error) {
 	y, err := inst.LoadYAML()
 	if err != nil {
 		return nil, err
@@ -87,6 +87,10 @@ func Prepare(_ context.Context, inst *store.Instance) (*Prepared, error) {
 		return nil, err
 	}
 
+	if err := limaDriver.Initialize(ctx); err != nil {
+		return nil, err
+	}
+
 	// Check if the instance has been created (the base disk already exists)
 	created := false
 	baseDisk := filepath.Join(inst.Dir, filenames.BaseDisk)
@@ -114,6 +118,7 @@ func Start(ctx context.Context, inst *store.Instance) error {
 	if _, err := os.Stat(haPIDPath); !errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("instance %q seems running (hint: remove %q if the instance is not actually running)", inst.Name, haPIDPath)
 	}
+	logrus.Infof("Starting the instance %q with VM driver %q", inst.Name, inst.VMType)
 
 	haSockPath := filepath.Join(inst.Dir, filenames.HostAgentSock)
 

pkg/vz/vz_driver_darwin.go

@@ -129,6 +129,11 @@ func (l *LimaVzDriver) Validate() error {
 	return nil
 }
 
+func (l *LimaVzDriver) Initialize(_ context.Context) error {
+	_, err := getMachineIdentifier(l.BaseDriver)
+	return err
+}
+
 func (l *LimaVzDriver) CreateDisk() error {
 	return EnsureDisk(l.BaseDriver)
 }