Update pkg/qemuimgutil/qemuimgutil.go

Co-authored-by: Oleksandr Redko <[email protected]>

Author: AkihiroSuda

pkg/qemuimgutil/qemuimgutil.go

@@ -103,35 +103,31 @@ type InfoFormatSpecificDataVmdkExtent struct {
 }
 
 func convertToRaw(source, dest string) error {
-	// If source == dest, we need to use a temporary file to avoid file locking issues
-	if source == dest {
-		// Get info to check if it's already raw format
-		info, err := getInfo(source)
-		if err != nil {
-			return fmt.Errorf("failed to get info for source disk %q: %w", source, err)
-		}
-		// If already raw, no conversion needed
-		if info.Format == "raw" {
-			return nil
-		}
+	if source != dest {
+		return execQemuImgConvert(source, dest)
+	}
 
-		// Create temporary file for conversion
-		tempFile := dest + ".lima-qemu-convert.tmp"
-		defer os.Remove(tempFile) // Clean up temp file
+	// If source == dest, we need to use a temporary file to avoid file locking issues
+	
+	info, err := getInfo(source)
+	if err != nil {
+		return fmt.Errorf("failed to get info for source disk %q: %w", source, err)
+	}
+	if info.Format == "raw" {
+		return nil
+	}
 
-		// Convert to temp file first
-		if err := convertToRawHelper(source, tempFile); err != nil {
-			return err
-		}
+	tempFile := dest + ".lima-qemu-convert.tmp"
+	defer os.Remove(tempFile)
 
-		// Replace original with converted file
-		return os.Rename(tempFile, dest)
+	if err := execQemuImgConvert(source, tempFile); err != nil {
+		return err
 	}
 
-	return convertToRawHelper(source, dest)
+	return os.Rename(tempFile, dest)
 }
 
-func convertToRawHelper(source, dest string) error {
+func execQemuImgConvert(source, dest string) error {
 	var stdout, stderr bytes.Buffer
 	cmd := exec.Command("qemu-img", "convert", "-O", "raw", source, dest)
 	cmd.Stdout = &stdout