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 <[email protected]>
kata-containers · May 3, 2018 · 85865f1 · 85865f1
1 parent 718dbd2
commit 85865f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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),
 			},
 		)
 	}