QEMU: use a static offset to choose vsock port on the host side

600000 is arbitrarily picked to avoid conflicts with the "standard" networking
range of 65535 ports, since vsock supports 32-bit port numbers.

Author: vikanezrimaya

lib/runners/qemu.nix

@@ -163,12 +163,10 @@ lib.warnIf (mem == 2048) ''
     # Clean up temporary files.
     ${pkgs.coreutils}/bin/rm -f ./socat.log ./notify_socket.cred
     # Default value: for running without systemd.
-    NOTIFY_VSOCK_PORT=8888
+    NOTIFY_VSOCK_PORT=$(( 600000 + ${vsock.cid} ))
     # Start socat to forward systemd notify socket over vsock
     if [ -n "''${NOTIFY_SOCKET-}" ]; then
-        ${pkgs.socat}/bin/socat -d -d VSOCK-LISTEN:-1,fork UNIX-SENDTO:$NOTIFY_SOCKET 2> ./socat.log &
-        NOTIFY_VSOCK_PORT=$({ ${pkgs.coreutils}/bin/tail -f ./socat.log || true; } | ${pkgs.gawk}/bin/awk '/listening on/ { if (match($0, /port:[0-9]*/)) { print substr($0, RSTART + 5, RLENGTH - 5); exit; } }')
-        echo "Picked port for notify vsock: $NOTIFY_VSOCK_PORT"
+        ${pkgs.socat}/bin/socat -d -d VSOCK-LISTEN:$NOTIFY_VSOCK_PORT,fork UNIX-SENDTO:$NOTIFY_SOCKET 2> ./socat.log &
     fi
     echo -n "vsock-stream:2:$NOTIFY_VSOCK_PORT" > ./notify_socket.cred
 
@@ -322,7 +320,7 @@ lib.warnIf (mem == 2048) ''
       # tried, SMBIOS Type 11 entries simply don't work. It looks like it might
       # be broken on QEMU side. Why? I don't know.
       "-fw_cfg"
-      "name=opt/io.systemd.credentials/vmm.notify_socket,file=./notify_socket.cred"
+      "name=opt/io.systemd.credentials/vmm.notify_socket,string=vsock-stream:2:${toString (600000 + vsock.cid)}"
     ]
     ++
     extraArgs