From 281183755b40c13995c981a135faeaf61b13ae2c Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 28 Feb 2023 16:58:54 +0100
Subject: [PATCH] qemu: replace -nic with -netdev to get >8 NICs, fix MAC
 calculation

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 qemu/qemu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qemu/qemu.sh b/qemu/qemu.sh
index bea2bb11..09803204 100755
--- a/qemu/qemu.sh
+++ b/qemu/qemu.sh
@@ -89,12 +89,12 @@ net_args()
     elif [ "$QEMU_NET_TAP" = "y" ]; then
 	QEMU_NET_TAP_N=${QEMU_NET_TAP_N:-1}
 	mactab=$(dirname "$QEMU_ROOTFS")/mactab
-	rm "$mactab"
+	rm -f "$mactab"
 	for i in $(seq 0 $(($QEMU_NET_TAP_N - 1))); do
-		echo "e$i	52:54:00:12:34:$((56 + i))" >>"$mactab"
-		echo -n "-nic tap,ifname=qtap$i,script=no,model=$QEMU_NET_MODEL "
+	    printf "e$i	52:54:00:12:34:%02x\n" $((0x56 + i)) >>"$mactab"
+	    echo -n "-netdev tap,id=nd$i,ifname=qtap$i -device e1000,netdev=nd$i "
 	done
-	echo -n "-fw_cfg name=opt/mactab,file="$mactab" "
+	echo -n "-fw_cfg name=opt/mactab,file=$mactab "
     elif [ "$QEMU_NET_USER" = "y" ]; then
 	[ "$QEMU_NET_USER_OPTS" ] && QEMU_NET_USER_OPTS="$QEMU_NET_USER_OPTS,"