Skip to content

Commit 974ff07

Browse files
committed
refactor(driver): move qemu,vz and wsl2 to pkg/driver
Signed-off-by: Ansuman Sahoo <[email protected]>
1 parent 7a082d2 commit 974ff07

26 files changed

+16
-16
lines changed

cmd/limactl/disk.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/docker/go-units"
1717
"github.com/lima-vm/go-qcow2reader"
1818
"github.com/lima-vm/lima/pkg/nativeimgutil"
19-
"github.com/lima-vm/lima/pkg/qemu/imgutil"
19+
"github.com/lima-vm/lima/pkg/qemuimgutil"
2020
"github.com/lima-vm/lima/pkg/store"
2121
"github.com/lima-vm/lima/pkg/store/filenames"
2222
"github.com/sirupsen/logrus"
@@ -115,7 +115,7 @@ func diskCreateAction(cmd *cobra.Command, args []string) error {
115115
if format == "raw" {
116116
err = nativeimgutil.CreateRawDisk(dataDisk, int(diskSize))
117117
} else {
118-
err = imgutil.CreateDisk(dataDisk, format, int(diskSize))
118+
err = qemuimgutil.CreateDisk(dataDisk, format, int(diskSize))
119119
}
120120
if err != nil {
121121
rerr := os.RemoveAll(diskDir)
@@ -412,7 +412,7 @@ func diskResizeAction(cmd *cobra.Command, args []string) error {
412412
if disk.Format == "raw" {
413413
err = nativeimgutil.ResizeRawDisk(dataDisk, int(diskSize))
414414
} else {
415-
err = imgutil.ResizeDisk(dataDisk, disk.Format, int(diskSize))
415+
err = qemuimgutil.ResizeDisk(dataDisk, disk.Format, int(diskSize))
416416
}
417417
if err != nil {
418418
return fmt.Errorf("failed to resize disk %q: %w", diskName, err)

pkg/builtins/drivers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package builtins
55

66
import (
77
// Import all built-in drivers to register them in the registry.
8-
_ "github.com/lima-vm/lima/pkg/qemu"
9-
_ "github.com/lima-vm/lima/pkg/vz"
10-
_ "github.com/lima-vm/lima/pkg/wsl2"
8+
_ "github.com/lima-vm/lima/pkg/driver/qemu"
9+
_ "github.com/lima-vm/lima/pkg/driver/vz"
10+
_ "github.com/lima-vm/lima/pkg/driver/wsl2"
1111
)

pkg/qemu/qemu.go renamed to pkg/driver/qemu/qemu.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/lima-vm/lima/pkg/iso9660util"
3232
"github.com/lima-vm/lima/pkg/limayaml"
3333
"github.com/lima-vm/lima/pkg/networks"
34-
"github.com/lima-vm/lima/pkg/qemu/imgutil"
34+
"github.com/lima-vm/lima/pkg/qemuimgutil"
3535
"github.com/lima-vm/lima/pkg/store"
3636
"github.com/lima-vm/lima/pkg/store/filenames"
3737
"github.com/mattn/go-shellwords"
@@ -137,11 +137,11 @@ func EnsureDisk(ctx context.Context, cfg Config) error {
137137
if err != nil {
138138
return err
139139
}
140-
baseDiskInfo, err := imgutil.GetInfo(baseDisk)
140+
baseDiskInfo, err := qemuimgutil.GetInfo(baseDisk)
141141
if err != nil {
142142
return fmt.Errorf("failed to get the information of base disk %q: %w", baseDisk, err)
143143
}
144-
if err = imgutil.AcceptableAsBasedisk(baseDiskInfo); err != nil {
144+
if err = qemuimgutil.AcceptableAsBasedisk(baseDiskInfo); err != nil {
145145
return fmt.Errorf("file %q is not acceptable as the base disk: %w", baseDisk, err)
146146
}
147147
if baseDiskInfo.Format == "" {
@@ -691,11 +691,11 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
691691
if diskSize, _ := units.RAMInBytes(*cfg.LimaYAML.Disk); diskSize > 0 {
692692
args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio,discard=on", diffDisk))
693693
} else if !isBaseDiskCDROM {
694-
baseDiskInfo, err := imgutil.GetInfo(baseDisk)
694+
baseDiskInfo, err := qemuimgutil.GetInfo(baseDisk)
695695
if err != nil {
696696
return "", nil, fmt.Errorf("failed to get the information of %q: %w", baseDisk, err)
697697
}
698-
if err = imgutil.AcceptableAsBasedisk(baseDiskInfo); err != nil {
698+
if err = qemuimgutil.AcceptableAsBasedisk(baseDiskInfo); err != nil {
699699
return "", nil, fmt.Errorf("file %q is not acceptable as the base disk: %w", baseDisk, err)
700700
}
701701
if baseDiskInfo.Format == "" {

pkg/qemu/qemu_driver.go renamed to pkg/driver/qemu/qemu_driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"github.com/digitalocean/go-qemu/qmp"
2626
"github.com/digitalocean/go-qemu/qmp/raw"
2727
"github.com/lima-vm/lima/pkg/driver"
28+
"github.com/lima-vm/lima/pkg/driver/qemu/entitlementutil"
2829
"github.com/lima-vm/lima/pkg/executil"
2930
"github.com/lima-vm/lima/pkg/limayaml"
3031
"github.com/lima-vm/lima/pkg/networks/usernet"
3132
"github.com/lima-vm/lima/pkg/osutil"
32-
"github.com/lima-vm/lima/pkg/qemu/entitlementutil"
3333
"github.com/lima-vm/lima/pkg/store"
3434
"github.com/lima-vm/lima/pkg/store/filenames"
3535
"github.com/sirupsen/logrus"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)