github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 17:37:20 +00:00
Code Issues Projects Releases Wiki Activity

arm64: correct bridge type for QEMUVIRT

Browse Source 
port forward PR https://github.com/kata-containers/runtime/pull/3017

Fixes: #3016
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
Jianyong Wu
2020-10-16 14:25:45 +08:00
parent 6f46be2f2e
commit 9eab301526
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/virtcontainers/qemu.go
View File

@@ -1976,7 +1976,7 @@ func genericBridges(number uint32, machineType string) []types.Bridge {
case QemuPC: case QemuPC:
bt = types.PCI bt = types.PCI
case QemuVirt: case QemuVirt:
bt = types.PCIE bt = types.PCI
case QemuPseries: case QemuPseries:
bt = types.PCI bt = types.PCI
case QemuCCWVirtio: case QemuCCWVirtio:

2
src/runtime/virtcontainers/qemu_arm64_test.go
View File

@@ -77,7 +77,7 @@ func TestQemuArm64AppendBridges(t *testing.T) {
expectedOut := []govmmQemu.Device{ expectedOut := []govmmQemu.Device{
govmmQemu.BridgeDevice{ govmmQemu.BridgeDevice{
Type: govmmQemu.PCIEBridge, Type: govmmQemu.PCIBridge,
Bus: defaultBridgeBus, Bus: defaultBridgeBus,
ID: bridges[0].ID, ID: bridges[0].ID,
Chassis: 1, Chassis: 1,