diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go index d41fc41e33..855dbe532a 100644 --- a/src/runtime/virtcontainers/acrn.go +++ b/src/runtime/virtcontainers/acrn.go @@ -642,7 +642,7 @@ func (a *Acrn) GetVMConsole(ctx context.Context, id string) (string, string, err return consoleProtoUnix, consoleURL, nil } -func (a *Acrn) saveSandbox() error { +func (a *Acrn) SaveVM() error { a.Logger().Info("Save sandbox") // Not supported. return success diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index d5401c3f35..77d1960f1f 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -721,7 +721,7 @@ func (clh *cloudHypervisor) PauseVM(ctx context.Context) error { return nil } -func (clh *cloudHypervisor) saveSandbox() error { +func (clh *cloudHypervisor) SaveVM() error { clh.Logger().WithField("function", "saveSandboxC").Info("Save Sandbox") return nil } diff --git a/src/runtime/virtcontainers/fc.go b/src/runtime/virtcontainers/fc.go index 86d628b28d..663d78f59d 100644 --- a/src/runtime/virtcontainers/fc.go +++ b/src/runtime/virtcontainers/fc.go @@ -889,7 +889,7 @@ func (fc *firecracker) PauseVM(ctx context.Context) error { return nil } -func (fc *firecracker) saveSandbox() error { +func (fc *firecracker) SaveVM() error { return nil } diff --git a/src/runtime/virtcontainers/hypervisor.go b/src/runtime/virtcontainers/hypervisor.go index 70387a385b..88c711db7e 100644 --- a/src/runtime/virtcontainers/hypervisor.go +++ b/src/runtime/virtcontainers/hypervisor.go @@ -903,7 +903,7 @@ type hypervisor interface { // just perform cleanup. stopSandbox(ctx context.Context, waitOnly bool) error PauseVM(ctx context.Context) error - saveSandbox() error + SaveVM() error resumeSandbox(ctx context.Context) error AddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) error HotplugAddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) (interface{}, error) diff --git a/src/runtime/virtcontainers/mock_hypervisor.go b/src/runtime/virtcontainers/mock_hypervisor.go index e9f3144a97..aecf275d48 100644 --- a/src/runtime/virtcontainers/mock_hypervisor.go +++ b/src/runtime/virtcontainers/mock_hypervisor.go @@ -62,7 +62,7 @@ func (m *mockHypervisor) resumeSandbox(ctx context.Context) error { return nil } -func (m *mockHypervisor) saveSandbox() error { +func (m *mockHypervisor) SaveVM() error { return nil } diff --git a/src/runtime/virtcontainers/mock_hypervisor_test.go b/src/runtime/virtcontainers/mock_hypervisor_test.go index 9f0113b85d..dbdbbdf5f0 100644 --- a/src/runtime/virtcontainers/mock_hypervisor_test.go +++ b/src/runtime/virtcontainers/mock_hypervisor_test.go @@ -76,7 +76,7 @@ func TestMockHypervisorGetSandboxConsole(t *testing.T) { func TestMockHypervisorSaveSandbox(t *testing.T) { var m *mockHypervisor - assert.NoError(t, m.saveSandbox()) + assert.NoError(t, m.SaveVM()) } func TestMockHypervisorDisconnect(t *testing.T) { diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index ec4b113e3e..1a151c3327 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -2038,7 +2038,7 @@ func (q *qemu) GetVMConsole(ctx context.Context, id string) (string, string, err return consoleProtoUnix, consoleURL, nil } -func (q *qemu) saveSandbox() error { +func (q *qemu) SaveVM() error { q.Logger().Info("Save sandbox") if err := q.qmpSetup(); err != nil { diff --git a/src/runtime/virtcontainers/vm.go b/src/runtime/virtcontainers/vm.go index 2455711ac9..ad1a7cd6d4 100644 --- a/src/runtime/virtcontainers/vm.go +++ b/src/runtime/virtcontainers/vm.go @@ -221,7 +221,7 @@ func (v *VM) Pause(ctx context.Context) error { // Save saves a VM to persistent disk. func (v *VM) Save() error { v.logger().Info("Save vm") - return v.hypervisor.saveSandbox() + return v.hypervisor.SaveVM() } // Resume resumes a paused VM.