runtime: Merge fixes

Update tests to fix merge errors

Signed-off-by: stevenhorsman <steven@uk.ibm.com>

src/runtime/virtcontainers/qemu_amd64_test.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/intel-go/cpuid"
 	govmmQemu "github.com/kata-containers/kata-containers/src/runtime/pkg/govmm/qemu"
 	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
 	"github.com/stretchr/testify/assert"
@@ -279,7 +280,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) {
 	assert.NoError(err)
 	assert.Empty(bios)
 
-	expectedOut = append(expectedOut,
+	expectedOut := []govmmQemu.Device{
 		govmmQemu.Object{
 			Type:            govmmQemu.SNPGuest,
 			ID:              "snp",
@@ -288,7 +289,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) {
 			CBitPos:         cpuid.AMDMemEncrypt.CBitPosition,
 			ReducedPhysBits: 1,
 		},
-	)
+	}
 
 	assert.Equal(expectedOut, devices)
 
@@ -299,7 +300,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) {
 	assert.NoError(err)
 	assert.Empty(bios)
 
-	expectedOut := []govmmQemu.Device{
+	expectedOut = append(expectedOut,
 		govmmQemu.Object{
 			Driver:   govmmQemu.Loader,
 			Type:     govmmQemu.TDXGuest,
@@ -308,7 +309,7 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) {
 			Debug:    false,
 			File:     firmware,
 		},
-	}
+	)
 
 	assert.Equal(expectedOut, devices)
 }