From 897faf08d9f205bc12eb4ea00837b19d77d3605c Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 17 May 2024 14:36:06 +0000 Subject: [PATCH] qemu: Fix off-by-one in topology generation When interface naming switched to use 1-based indices instead of 0-based, the topology generation was overlooked thus breaking tests against a `make run` instance. Bring everything back in sync. --- board/common/qemu/qemu.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/common/qemu/qemu.sh b/board/common/qemu/qemu.sh index 8ad76eae..3b005177 100755 --- a/board/common/qemu/qemu.sh +++ b/board/common/qemu/qemu.sh @@ -312,10 +312,10 @@ generate_dot() { [ "$CONFIG_QEMU_NET_TAP" = "y" ] || return - hostports=" qtap0" - targetports=" e0" - edges="host:qtap0 -- target:e0 [kind=mgmt];" - for tap in $(seq 1 $(($CONFIG_QEMU_NET_TAP_N - 1))); do + hostports=" qtap1" + targetports=" e1" + edges="host:qtap1 -- target:e1 [kind=mgmt];" + for tap in $(seq 2 $(($CONFIG_QEMU_NET_TAP_N - 1))); do hostports="$hostports | qtap$tap " targetports="$targetports | e$tap " edges="$edges host:qtap$tap -- target:e$tap;"