github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-29 12:54:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Megan Wright 2023-02-21 14:23:17 +00:00
parent 25aa03aefe
commit 241a5a490f
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/virtcontainers/qemu_amd64.go
View File

@ -310,16 +310,6 @@ func (q *qemuAmd64) appendProtectionDevice(devices []govmmQemu.Device, firmware,
File: firmware, File: firmware,
FirmwareVolume: firmwareVolume, FirmwareVolume: firmwareVolume,
}), "", nil }), "", nil
case sevProtection:
return append(devices,
govmmQemu.Object{
Type: govmmQemu.SEVGuest,
ID: "sev",
Debug: false,
File: firmware,
CBitPos: cpuid.AMDMemEncrypt.CBitPosition,
ReducedPhysBits: 1,
}), "", nil
case snpProtection: case snpProtection:
return append(devices, return append(devices,
govmmQemu.Object{ govmmQemu.Object{

20
src/runtime/virtcontainers/qemu_amd64_test.go
View File

@ -272,26 +272,6 @@ func TestQemuAmd64AppendProtectionDevice(t *testing.T) {
assert.Error(err) assert.Error(err)
assert.Empty(bios) assert.Empty(bios)
// sev protection
amd64.(*qemuAmd64).protection = sevProtection
devices, bios, err = amd64.appendProtectionDevice(devices, firmware, "")
assert.NoError(err)
assert.Empty(bios)
expectedOut := []govmmQemu.Device{
govmmQemu.Object{
Type: govmmQemu.SEVGuest,
ID: "sev",
Debug: false,
File: firmware,
CBitPos: cpuid.AMDMemEncrypt.CBitPosition,
ReducedPhysBits: 1,
},
}
assert.Equal(expectedOut, devices)
// snp protection // snp protection
amd64.(*qemuAmd64).protection = snpProtection amd64.(*qemuAmd64).protection = snpProtection