Move the run parameter to the qemu driver

afbjorklund · afbjorklund · commit 00b822adedd5 · 2023-01-23T08:50:03.000+01:00
Signed-off-by: Anders F Björklund &lt;anders.f.bjorklund@gmail.com&gt;
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
@@ -17,13 +17,13 @@ type Driver interface {
 
 	Stop(_ context.Context) error
 
-	CreateSnapshot(_ context.Context, run bool, tag string) error
+	CreateSnapshot(_ context.Context, tag string) error
 
-	ApplySnapshot(_ context.Context, run bool, tag string) error
+	ApplySnapshot(_ context.Context, tag string) error
 
-	DeleteSnapshot(_ context.Context, run bool, tag string) error
+	DeleteSnapshot(_ context.Context, tag string) error
 
-	ListSnapshots(_ context.Context, run bool) (string, error)
+	ListSnapshots(_ context.Context) (string, error)
 }
 
 type BaseDriver struct {
@@ -49,18 +49,18 @@ func (d *BaseDriver) Stop(_ context.Context) error {
 	return nil
 }
 
-func (d *BaseDriver) CreateSnapshot(_ context.Context, _ bool, _ string) error {
+func (d *BaseDriver) CreateSnapshot(_ context.Context, _ string) error {
 	return fmt.Errorf("unimplemented")
 }
 
-func (d *BaseDriver) ApplySnapshot(_ context.Context, _ bool, _ string) error {
+func (d *BaseDriver) ApplySnapshot(_ context.Context, _ string) error {
 	return fmt.Errorf("unimplemented")
 }
 
-func (d *BaseDriver) DeleteSnapshot(_ context.Context, _ bool, _ string) error {
+func (d *BaseDriver) DeleteSnapshot(_ context.Context, _ string) error {
 	return fmt.Errorf("unimplemented")
 }
 
-func (d *BaseDriver) ListSnapshots(_ context.Context, _ bool) (string, error) {
+func (d *BaseDriver) ListSnapshots(_ context.Context) (string, error) {
 	return "", nil
 }
diff --git a/pkg/qemu/qemu_driver.go b/pkg/qemu/qemu_driver.go
@@ -19,6 +19,7 @@ import (
 	"github.com/digitalocean/go-qemu/qmp/raw"
 	"github.com/lima-vm/lima/pkg/driver"
 	"github.com/lima-vm/lima/pkg/limayaml"
+	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
 )
@@ -155,40 +156,40 @@ func logPipeRoutine(r io.Reader, header string) {
 	}
 }
 
-func (l *LimaQemuDriver) DeleteSnapshot(ctx context.Context, run bool, tag string) error {
+func (l *LimaQemuDriver) DeleteSnapshot(ctx context.Context, tag string) error {
 	qCfg := Config{
 		Name:        l.Instance.Name,
 		InstanceDir: l.Instance.Dir,
 		LimaYAML:    l.Yaml,
 	}
-	return Del(qCfg, run, tag)
+	return Del(qCfg, l.Instance.Status == store.StatusRunning, tag)
 }
 
-func (l *LimaQemuDriver) CreateSnapshot(ctx context.Context, run bool, tag string) error {
+func (l *LimaQemuDriver) CreateSnapshot(ctx context.Context, tag string) error {
 	qCfg := Config{
 		Name:        l.Instance.Name,
 		InstanceDir: l.Instance.Dir,
 		LimaYAML:    l.Yaml,
 	}
-	return Save(qCfg, run, tag)
+	return Save(qCfg, l.Instance.Status == store.StatusRunning, tag)
 }
 
-func (l *LimaQemuDriver) ApplySnapshot(ctx context.Context, run bool, tag string) error {
+func (l *LimaQemuDriver) ApplySnapshot(ctx context.Context, tag string) error {
 	qCfg := Config{
 		Name:        l.Instance.Name,
 		InstanceDir: l.Instance.Dir,
 		LimaYAML:    l.Yaml,
 	}
-	return Load(qCfg, run, tag)
+	return Load(qCfg, l.Instance.Status == store.StatusRunning, tag)
 }
 
-func (l *LimaQemuDriver) ListSnapshots(ctx context.Context, run bool) (string, error) {
+func (l *LimaQemuDriver) ListSnapshots(ctx context.Context) (string, error) {
 	qCfg := Config{
 		Name:        l.Instance.Name,
 		InstanceDir: l.Instance.Dir,
 		LimaYAML:    l.Yaml,
 	}
-	return List(qCfg, run)
+	return List(qCfg, l.Instance.Status == store.StatusRunning)
 }
 
 type qArgTemplateApplier struct {
diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go
@@ -17,7 +17,7 @@ func Del(ctx context.Context, inst *store.Instance, tag string) error {
 		Instance: inst,
 		Yaml:     y,
 	})
-	return limaDriver.DeleteSnapshot(ctx, inst.Status == store.StatusRunning, tag)
+	return limaDriver.DeleteSnapshot(ctx, tag)
 }
 
 func Save(ctx context.Context, inst *store.Instance, tag string) error {
@@ -29,7 +29,7 @@ func Save(ctx context.Context, inst *store.Instance, tag string) error {
 		Instance: inst,
 		Yaml:     y,
 	})
-	return limaDriver.CreateSnapshot(ctx, inst.Status == store.StatusRunning, tag)
+	return limaDriver.CreateSnapshot(ctx, tag)
 }
 
 func Load(ctx context.Context, inst *store.Instance, tag string) error {
@@ -41,7 +41,7 @@ func Load(ctx context.Context, inst *store.Instance, tag string) error {
 		Instance: inst,
 		Yaml:     y,
 	})
-	return limaDriver.ApplySnapshot(ctx, inst.Status == store.StatusRunning, tag)
+	return limaDriver.ApplySnapshot(ctx, tag)
 }
 
 func List(ctx context.Context, inst *store.Instance) (string, error) {
@@ -53,5 +53,5 @@ func List(ctx context.Context, inst *store.Instance) (string, error) {
 		Instance: inst,
 		Yaml:     y,
 	})
-	return limaDriver.ListSnapshots(ctx, inst.Status == store.StatusRunning)
+	return limaDriver.ListSnapshots(ctx)
 }

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ type Driver interface {`
`17`	`17`
`18`	`18`	`Stop(_ context.Context) error`
`19`	`19`
`20`		`- CreateSnapshot(_ context.Context, run bool, tag string) error`
	`20`	`+ CreateSnapshot(_ context.Context, tag string) error`
`21`	`21`
`22`		`- ApplySnapshot(_ context.Context, run bool, tag string) error`
	`22`	`+ ApplySnapshot(_ context.Context, tag string) error`
`23`	`23`
`24`		`- DeleteSnapshot(_ context.Context, run bool, tag string) error`
	`24`	`+ DeleteSnapshot(_ context.Context, tag string) error`
`25`	`25`
`26`		`- ListSnapshots(_ context.Context, run bool) (string, error)`
	`26`	`+ ListSnapshots(_ context.Context) (string, error)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`type BaseDriver struct {`
`@@ -49,18 +49,18 @@ func (d *BaseDriver) Stop(_ context.Context) error {`
`49`	`49`	`return nil`
`50`	`50`	`}`
`51`	`51`
`52`		`-func (d *BaseDriver) CreateSnapshot(_ context.Context, _ bool, _ string) error {`
	`52`	`+func (d *BaseDriver) CreateSnapshot(_ context.Context, _ string) error {`
`53`	`53`	`return fmt.Errorf("unimplemented")`
`54`	`54`	`}`
`55`	`55`
`56`		`-func (d *BaseDriver) ApplySnapshot(_ context.Context, _ bool, _ string) error {`
	`56`	`+func (d *BaseDriver) ApplySnapshot(_ context.Context, _ string) error {`
`57`	`57`	`return fmt.Errorf("unimplemented")`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (d *BaseDriver) DeleteSnapshot(_ context.Context, _ bool, _ string) error {`
	`60`	`+func (d *BaseDriver) DeleteSnapshot(_ context.Context, _ string) error {`
`61`	`61`	`return fmt.Errorf("unimplemented")`
`62`	`62`	`}`
`63`	`63`
`64`		`-func (d *BaseDriver) ListSnapshots(_ context.Context, _ bool) (string, error) {`
	`64`	`+func (d *BaseDriver) ListSnapshots(_ context.Context) (string, error) {`
`65`	`65`	`return "", nil`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"github.com/digitalocean/go-qemu/qmp/raw"`
`20`	`20`	`"github.com/lima-vm/lima/pkg/driver"`
`21`	`21`	`"github.com/lima-vm/lima/pkg/limayaml"`
	`22`	`+ "github.com/lima-vm/lima/pkg/store"`
`22`	`23`	`"github.com/lima-vm/lima/pkg/store/filenames"`
`23`	`24`	`"github.com/sirupsen/logrus"`
`24`	`25`	`)`
`@@ -155,40 +156,40 @@ func logPipeRoutine(r io.Reader, header string) {`
`155`	`156`	`}`
`156`	`157`	`}`
`157`	`158`
`158`		`-func (l *LimaQemuDriver) DeleteSnapshot(ctx context.Context, run bool, tag string) error {`
	`159`	`+func (l *LimaQemuDriver) DeleteSnapshot(ctx context.Context, tag string) error {`
`159`	`160`	`qCfg := Config{`
`160`	`161`	`Name: l.Instance.Name,`
`161`	`162`	`InstanceDir: l.Instance.Dir,`
`162`	`163`	`LimaYAML: l.Yaml,`
`163`	`164`	`}`
`164`		`- return Del(qCfg, run, tag)`
	`165`	`+ return Del(qCfg, l.Instance.Status == store.StatusRunning, tag)`
`165`	`166`	`}`
`166`	`167`
`167`		`-func (l *LimaQemuDriver) CreateSnapshot(ctx context.Context, run bool, tag string) error {`
	`168`	`+func (l *LimaQemuDriver) CreateSnapshot(ctx context.Context, tag string) error {`
`168`	`169`	`qCfg := Config{`
`169`	`170`	`Name: l.Instance.Name,`
`170`	`171`	`InstanceDir: l.Instance.Dir,`
`171`	`172`	`LimaYAML: l.Yaml,`
`172`	`173`	`}`
`173`		`- return Save(qCfg, run, tag)`
	`174`	`+ return Save(qCfg, l.Instance.Status == store.StatusRunning, tag)`
`174`	`175`	`}`
`175`	`176`
`176`		`-func (l *LimaQemuDriver) ApplySnapshot(ctx context.Context, run bool, tag string) error {`
	`177`	`+func (l *LimaQemuDriver) ApplySnapshot(ctx context.Context, tag string) error {`
`177`	`178`	`qCfg := Config{`
`178`	`179`	`Name: l.Instance.Name,`
`179`	`180`	`InstanceDir: l.Instance.Dir,`
`180`	`181`	`LimaYAML: l.Yaml,`
`181`	`182`	`}`
`182`		`- return Load(qCfg, run, tag)`
	`183`	`+ return Load(qCfg, l.Instance.Status == store.StatusRunning, tag)`
`183`	`184`	`}`
`184`	`185`
`185`		`-func (l *LimaQemuDriver) ListSnapshots(ctx context.Context, run bool) (string, error) {`
	`186`	`+func (l *LimaQemuDriver) ListSnapshots(ctx context.Context) (string, error) {`
`186`	`187`	`qCfg := Config{`
`187`	`188`	`Name: l.Instance.Name,`
`188`	`189`	`InstanceDir: l.Instance.Dir,`
`189`	`190`	`LimaYAML: l.Yaml,`
`190`	`191`	`}`
`191`		`- return List(qCfg, run)`
	`192`	`+ return List(qCfg, l.Instance.Status == store.StatusRunning)`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`type qArgTemplateApplier struct {`