From d2cae59ec77dec57431f71de614db5657b3ea111 Mon Sep 17 00:00:00 2001
From: Penny Zheng <penny.zheng@arm.com>
Date: Fri, 28 Feb 2020 04:58:17 +0000
Subject: [PATCH] FC: Removed redundant `RescanBlockDevice` action

Firecracker has removed RescanBlockDevice from the /actions API.
Related PR: https://github.com/firecracker-microvm/firecracker/pull/1542.
We need to remove according settings in kata-containers.

Fixes: #2504

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
---
 virtcontainers/fc.go                               | 14 --------------
 .../client/models/instance_action_info.go          | 10 ++--------
 virtcontainers/pkg/firecracker/firecracker.yaml    |  3 ---
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/virtcontainers/fc.go b/virtcontainers/fc.go
index ed3a6aac53..807d098741 100644
--- a/virtcontainers/fc.go
+++ b/virtcontainers/fc.go
@@ -934,20 +934,6 @@ func (fc *firecracker) fcUpdateBlockDrive(path, id string) error {
 		return err
 	}
 
-	// Rescan needs to used only if the VM is running
-	if fc.vmRunning() {
-		actionParams := ops.NewCreateSyncActionParams()
-		actionType := "BlockDeviceRescan"
-		actionInfo := &models.InstanceActionInfo{
-			ActionType: &actionType,
-			Payload:    id,
-		}
-		actionParams.SetInfo(actionInfo)
-		if _, err := fc.client().Operations.CreateSyncAction(actionParams); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 
diff --git a/virtcontainers/pkg/firecracker/client/models/instance_action_info.go b/virtcontainers/pkg/firecracker/client/models/instance_action_info.go
index 0e9fac242d..9389411fe6 100644
--- a/virtcontainers/pkg/firecracker/client/models/instance_action_info.go
+++ b/virtcontainers/pkg/firecracker/client/models/instance_action_info.go
@@ -21,11 +21,8 @@ type InstanceActionInfo struct {
 
 	// Enumeration indicating what type of action is contained in the payload
 	// Required: true
-	// Enum: [BlockDeviceRescan FlushMetrics InstanceStart SendCtrlAltDel]
+	// Enum: [FlushMetrics InstanceStart SendCtrlAltDel]
 	ActionType *string `json:"action_type"`
-
-	// payload
-	Payload string `json:"payload,omitempty"`
 }
 
 // Validate validates this instance action info
@@ -46,7 +43,7 @@ var instanceActionInfoTypeActionTypePropEnum []interface{}
 
 func init() {
 	var res []string
-	if err := json.Unmarshal([]byte(`["BlockDeviceRescan","FlushMetrics","InstanceStart","SendCtrlAltDel"]`), &res); err != nil {
+	if err := json.Unmarshal([]byte(`["FlushMetrics","InstanceStart","SendCtrlAltDel"]`), &res); err != nil {
 		panic(err)
 	}
 	for _, v := range res {
@@ -56,9 +53,6 @@ func init() {
 
 const (
 
-	// InstanceActionInfoActionTypeBlockDeviceRescan captures enum value "BlockDeviceRescan"
-	InstanceActionInfoActionTypeBlockDeviceRescan string = "BlockDeviceRescan"
-
 	// InstanceActionInfoActionTypeFlushMetrics captures enum value "FlushMetrics"
 	InstanceActionInfoActionTypeFlushMetrics string = "FlushMetrics"
 
diff --git a/virtcontainers/pkg/firecracker/firecracker.yaml b/virtcontainers/pkg/firecracker/firecracker.yaml
index 5df8a63e72..376da21808 100644
--- a/virtcontainers/pkg/firecracker/firecracker.yaml
+++ b/virtcontainers/pkg/firecracker/firecracker.yaml
@@ -449,12 +449,9 @@ definitions:
         description: Enumeration indicating what type of action is contained in the payload
         type: string
         enum:
-        - BlockDeviceRescan
         - FlushMetrics
         - InstanceStart
         - SendCtrlAltDel
-      payload:
-        type: string
 
   InstanceInfo:
     type: object