From 85865f1a2c5bfd8f784c1bb449f9bef3e3b2488d Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Thu, 26 Apr 2018 10:28:40 -0700 Subject: [PATCH] bridge: Store the bridge address to state We need to store the bridge address to state to use it for assigning addresses to devices attached to teh bridge. So we need to make sure that the bridge pointer is assigned the address. Signed-off-by: Archana Shinde --- virtcontainers/qemu_amd64.go | 4 ++-- virtcontainers/qemu_arch_base.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go index d9b613a6b6..2e3406a921 100644 --- a/virtcontainers/qemu_amd64.go +++ b/virtcontainers/qemu_amd64.go @@ -205,7 +205,7 @@ func (q *qemuAmd64) appendBridges(devices []govmmQemu.Device, bridges []Bridge) t = govmmQemu.PCIEBridge } - b.Addr = bridgePCIStartAddr + idx + bridges[idx].Addr = bridgePCIStartAddr + idx devices = append(devices, govmmQemu.BridgeDevice{ @@ -215,7 +215,7 @@ func (q *qemuAmd64) appendBridges(devices []govmmQemu.Device, bridges []Bridge) // Each bridge is required to be assigned a unique chassis id > 0 Chassis: (idx + 1), SHPC: true, - Addr: strconv.FormatInt(int64(b.Addr), 10), + Addr: strconv.FormatInt(int64(bridges[idx].Addr), 10), }, ) } diff --git a/virtcontainers/qemu_arch_base.go b/virtcontainers/qemu_arch_base.go index 225428a283..18336ae474 100644 --- a/virtcontainers/qemu_arch_base.go +++ b/virtcontainers/qemu_arch_base.go @@ -328,7 +328,7 @@ func (q *qemuArchBase) appendBridges(devices []govmmQemu.Device, bridges []Bridg t = govmmQemu.PCIEBridge } - b.Addr = bridgePCIStartAddr + idx + bridges[idx].Addr = bridgePCIStartAddr + idx devices = append(devices, govmmQemu.BridgeDevice{ @@ -338,7 +338,7 @@ func (q *qemuArchBase) appendBridges(devices []govmmQemu.Device, bridges []Bridg // Each bridge is required to be assigned a unique chassis id > 0 Chassis: (idx + 1), SHPC: true, - Addr: strconv.FormatInt(int64(b.Addr), 10), + Addr: strconv.FormatInt(int64(bridges[idx].Addr), 10), }, ) }