From f989078cd253b36b7f7a419fa87106e926a06695 Mon Sep 17 00:00:00 2001
From: Manohar Castelino <mcastelino@apple.com>
Date: Mon, 20 Sep 2021 16:18:23 -0700
Subject: [PATCH] hypervisor: resumeSandbox is ResumeVM

renaming...

Signed-off-by: Manohar Castelino <mcastelino@apple.com>
---
 src/runtime/virtcontainers/acrn.go            | 4 ++--
 src/runtime/virtcontainers/clh.go             | 4 ++--
 src/runtime/virtcontainers/fc.go              | 2 +-
 src/runtime/virtcontainers/hypervisor.go      | 2 +-
 src/runtime/virtcontainers/mock_hypervisor.go | 2 +-
 src/runtime/virtcontainers/qemu.go            | 4 ++--
 src/runtime/virtcontainers/vm.go              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/runtime/virtcontainers/acrn.go b/src/runtime/virtcontainers/acrn.go
index 855dbe532a..1e469856f7 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 77d1960f1f..44dbb08e5e 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 663d78f59d..8cd74d4579 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 88c711db7e..1bad2a4a76 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 aecf275d48..944ffa2901 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 1a151c3327..cd6c0ab4b8 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 ad1a7cd6d4..a30cec6285 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.