From eca202e7ff1bdb71693538bb6f7bae1aefe36c24 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Fri, 16 Oct 2020 13:39:17 +0800 Subject: [PATCH] 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 (cherry picked from commit 141de5c9bd28d88ce0d02306f061ad11ebee49b0) --- virtcontainers/qemu.go | 2 +- virtcontainers/qemu_arm64_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index dd79274931..b5f1e9f3d6 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -1965,7 +1965,7 @@ func genericBridges(number uint32, machineType string) []types.Bridge { case QemuPC: bt = types.PCI case QemuVirt: - bt = types.PCIE + bt = types.PCI case QemuPseries: bt = types.PCI case QemuCCWVirtio: diff --git a/virtcontainers/qemu_arm64_test.go b/virtcontainers/qemu_arm64_test.go index 4035115829..728b8e0ff8 100644 --- a/virtcontainers/qemu_arm64_test.go +++ b/virtcontainers/qemu_arm64_test.go @@ -119,7 +119,7 @@ func TestQemuArm64AppendBridges(t *testing.T) { expectedOut := []govmmQemu.Device{ govmmQemu.BridgeDevice{ - Type: govmmQemu.PCIEBridge, + Type: govmmQemu.PCIBridge, Bus: defaultBridgeBus, ID: bridges[0].ID, Chassis: 1,