vz: improve log messages

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/nativeimgutil/nativeimgutil.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/continuity/fs"
+	"github.com/docker/go-units"
 	"github.com/lima-vm/go-qcow2reader"
 	"github.com/lima-vm/go-qcow2reader/image/qcow2"
 	"github.com/lima-vm/go-qcow2reader/image/raw"
@@ -34,6 +35,7 @@ func ConvertToRaw(source, dest string, size *int64, allowSourceWithBackingFile b
 	if size != nil && *size < srcImg.Size() {
 		return fmt.Errorf("specified size %d is smaller than the original image size (%d) of %q", *size, srcImg.Size(), source)
 	}
+	logrus.Infof("Converting %q (%s) to a raw disk %q", source, srcImg.Type(), dest)
 	switch t := srcImg.Type(); t {
 	case raw.Type:
 		if err = srcF.Close(); err != nil {
@@ -82,6 +84,7 @@ func ConvertToRaw(source, dest string, size *int64, allowSourceWithBackingFile b
 
 	// Resize
 	if size != nil {
+		logrus.Infof("Expanding to %s", units.BytesSize(float64(*size)))
 		if err = MakeSparse(destTmpF, *size); err != nil {
 			return err
 		}
@@ -105,6 +108,7 @@ func convertRawToRaw(source, dest string, size *int64) error {
 		}
 	}
 	if size != nil {
+		logrus.Infof("Expanding to %s", units.BytesSize(float64(*size)))
 		destF, err := os.OpenFile(dest, os.O_RDWR, 0644)
 		if err != nil {
 			return err

pkg/vz/disk.go

@@ -12,7 +12,6 @@ import (
 	"github.com/lima-vm/lima/pkg/iso9660util"
 	"github.com/lima-vm/lima/pkg/nativeimgutil"
 	"github.com/lima-vm/lima/pkg/store/filenames"
-	"github.com/sirupsen/logrus"
 )
 
 func EnsureDisk(driver *driver.BaseDriver) error {
@@ -58,9 +57,8 @@ func EnsureDisk(driver *driver.BaseDriver) error {
 		}
 		return diffDiskF.Close()
 	}
-	logrus.Infof("Converting %q to a raw disk %q (size=%d)", baseDisk, diffDisk, diskSize)
 	if err = nativeimgutil.ConvertToRaw(baseDisk, diffDisk, &diskSize, false); err != nil {
-		return fmt.Errorf("failed to convert %q to a raw disk %q (size=%d): %w", baseDisk, diffDisk, diskSize, err)
+		return fmt.Errorf("failed to convert %q to a raw disk %q: %w", baseDisk, diffDisk, err)
 	}
 	return err
 }