diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go index 855dbe532..1e469856f 100644 --- a/src/runtime/virtcontainers/acrn.go +++ b/src/runtime/virtcontainers/acrn.go @@ -586,8 +586,8 @@ func (a *Acrn) PauseVM(ctx context.Context) error { return nil } -func (a *Acrn) resumeSandbox(ctx context.Context) error { - span, _ := katatrace.Trace(ctx, a.Logger(), "resumeSandbox", acrnTracingTags, map[string]string{"sandbox_id": a.id}) +func (a *Acrn) ResumeVM(ctx context.Context) error { + span, _ := katatrace.Trace(ctx, a.Logger(), "ResumeVM", acrnTracingTags, map[string]string{"sandbox_id": a.id}) defer span.End() // Not supported. return success diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index 77d1960f1..44dbb08e5 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -726,8 +726,8 @@ func (clh *cloudHypervisor) SaveVM() error { return nil } -func (clh *cloudHypervisor) resumeSandbox(ctx context.Context) error { - clh.Logger().WithField("function", "resumeSandbox").Info("Resume Sandbox") +func (clh *cloudHypervisor) ResumeVM(ctx context.Context) error { + clh.Logger().WithField("function", "ResumeVM").Info("Resume Sandbox") return nil } diff --git a/src/runtime/virtcontainers/fc.go b/src/runtime/virtcontainers/fc.go index 663d78f59..8cd74d457 100644 --- a/src/runtime/virtcontainers/fc.go +++ b/src/runtime/virtcontainers/fc.go @@ -893,7 +893,7 @@ func (fc *firecracker) SaveVM() error { return nil } -func (fc *firecracker) resumeSandbox(ctx context.Context) error { +func (fc *firecracker) ResumeVM(ctx context.Context) error { return nil } diff --git a/src/runtime/virtcontainers/hypervisor.go b/src/runtime/virtcontainers/hypervisor.go index 88c711db7..1bad2a4a7 100644 --- a/src/runtime/virtcontainers/hypervisor.go +++ b/src/runtime/virtcontainers/hypervisor.go @@ -904,7 +904,7 @@ type hypervisor interface { stopSandbox(ctx context.Context, waitOnly bool) error PauseVM(ctx context.Context) error SaveVM() error - resumeSandbox(ctx context.Context) error + ResumeVM(ctx context.Context) error AddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) error HotplugAddDevice(ctx context.Context, devInfo interface{}, devType DeviceType) (interface{}, error) HotplugRemoveDevice(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 aecf275d4..944ffa290 100644 --- a/src/runtime/virtcontainers/mock_hypervisor.go +++ b/src/runtime/virtcontainers/mock_hypervisor.go @@ -58,7 +58,7 @@ func (m *mockHypervisor) PauseVM(ctx context.Context) error { return nil } -func (m *mockHypervisor) resumeSandbox(ctx context.Context) error { +func (m *mockHypervisor) ResumeVM(ctx context.Context) error { return nil } diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index 1a151c332..cd6c0ab4b 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -1958,8 +1958,8 @@ func (q *qemu) PauseVM(ctx context.Context) error { return q.togglePauseSandbox(ctx, true) } -func (q *qemu) resumeSandbox(ctx context.Context) error { - span, ctx := katatrace.Trace(ctx, q.Logger(), "resumeSandbox", qemuTracingTags, map[string]string{"sandbox_id": q.id}) +func (q *qemu) ResumeVM(ctx context.Context) error { + span, ctx := katatrace.Trace(ctx, q.Logger(), "ResumeVM", qemuTracingTags, map[string]string{"sandbox_id": q.id}) defer span.End() return q.togglePauseSandbox(ctx, false) diff --git a/src/runtime/virtcontainers/vm.go b/src/runtime/virtcontainers/vm.go index ad1a7cd6d..a30cec628 100644 --- a/src/runtime/virtcontainers/vm.go +++ b/src/runtime/virtcontainers/vm.go @@ -227,7 +227,7 @@ func (v *VM) Save() error { // Resume resumes a paused VM. func (v *VM) Resume(ctx context.Context) error { v.logger().Info("resume vm") - return v.hypervisor.resumeSandbox(ctx) + return v.hypervisor.ResumeVM(ctx) } // Start kicks off a configured VM.