riscv64: Improve command forwarding

Previous implementation uses `netcat` to test existence of pre-configured target port, but that port is occupied in advance of `sshd` inside VM is ready. Replace `netcat` with `ssh` with `ConnectTimeout` set to directly verify the connectivity of `sshd`. Signed-off-by: Ruoqing He <[email protected]>
rust-vmm · Sep 30, 2024 · b1cf97e · b1cf97e
1 parent 3fef366
commit b1cf97e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/riscv64/start_in_qemu.sh b/riscv64/start_in_qemu.sh
@@ -30,11 +30,12 @@ $QEMU_DIR/bin/qemu-system-riscv64 \
 
 HOST=riscv-qemu
 
-while ! nc -z localhost 2222; do   
-  echo "Dialing qemu-system-riscv64..."
-  sleep 1
+echo "Testing SSH connectivity to $HOST..."
+while ! ssh -o ConnectTimeout=3 $HOST exit; do
+  echo "$HOST is not ready..."
 done
 
 # Issue command
 COMMAND=$@
+echo "$HOST is ready, forwarding command: $COMMAND"
 ssh $HOST "export PATH=\"\$PATH:/root/.cargo/bin\" && cd workdir && $COMMAND"