Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit eca202e

Browse files
jongwuamshinde
authored andcommitted
arm64: correct bridge type for QEMUVIRT machine
The device pcie-pci-bridge in qemu will create a pci bus not pcie bus. It should be corrected for QEMUVIRT. After correct this, vfio pci device can be hotplugged in arm64. Fixes: #3016 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com> (cherry picked from commit 141de5c)
1 parent 314bc3d commit eca202e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

virtcontainers/qemu.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ func genericBridges(number uint32, machineType string) []types.Bridge {
19651965
case QemuPC:
19661966
bt = types.PCI
19671967
case QemuVirt:
1968-
bt = types.PCIE
1968+
bt = types.PCI
19691969
case QemuPseries:
19701970
bt = types.PCI
19711971
case QemuCCWVirtio:

virtcontainers/qemu_arm64_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestQemuArm64AppendBridges(t *testing.T) {
119119

120120
expectedOut := []govmmQemu.Device{
121121
govmmQemu.BridgeDevice{
122-
Type: govmmQemu.PCIEBridge,
122+
Type: govmmQemu.PCIBridge,
123123
Bus: defaultBridgeBus,
124124
ID: bridges[0].ID,
125125
Chassis: 1,

0 commit comments

Comments
 (0)