From 841da7540f4397b0cac5f47537d2a39aca9ec3cf Mon Sep 17 00:00:00 2001 From: Arthur Hanson Rasmusson Date: Wed, 23 Sep 2026 01:10:40 -0400 Subject: tools: keep all guest-diag artifacts in-tree (push helper, runtime launch script, README) --- tools/guest-diag/vmcycle.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'tools/guest-diag/vmcycle.sh') diff --git a/tools/guest-diag/vmcycle.sh b/tools/guest-diag/vmcycle.sh index 08eb4ea..6faaa75 100755 --- a/tools/guest-diag/vmcycle.sh +++ b/tools/guest-diag/vmcycle.sh @@ -1,19 +1,29 @@ #!/bin/bash # vmcycle.sh - reload cycle for the emulated vGPU stack: # stop QEMU -> remove mdevs -> rmmod/insmod open-iov-vfio.ko -> create a -# fresh mdev -> patch its UUID into the QEMU launch script -> relaunch. +# fresh mdev -> patch its UUID into the runtime launch script -> relaunch. +# +# ALL artifacts stay inside this directory (tools/guest-diag/) so nothing is +# lost on reboot: +# launch_qemu_rootport.sh - template QEMU command line (root-port fix) +# launch_qemu_rootport.run.sh - runtime copy with the current mdev UUID +# run/qemu.log - QEMU stderr/stdout of the last launch # # Usage: tools/guest-diag/vmcycle.sh -# Env: QEMU_SCRIPT (default: ./launch_qemu_rootport.sh next to this script) -# MDEV_PARENT (default: 0000:01:00.0) +# Env: MDEV_PARENT (default: 0000:01:00.0) # MDEV_TYPE (default: nvidia-nvidia-vgpu-turing) set -e HERE="$(cd "$(dirname "$0")" && pwd)" -QEMU_SCRIPT="${QEMU_SCRIPT:-$HERE/launch_qemu_rootport.sh}" +TEMPLATE="$HERE/launch_qemu_rootport.sh" +QEMU_SCRIPT="${QEMU_SCRIPT:-$HERE/launch_qemu_rootport.run.sh}" MODULE="${MODULE:-$HERE/../../kernel/open-iov-vfio.ko}" MDEV_PARENT="${MDEV_PARENT:-0000:01:00.0}" MDEV_TYPE="${MDEV_TYPE:-nvidia-nvidia-vgpu-turing}" +RUNDIR="$HERE/run" + +mkdir -p "$RUNDIR" +[ -f "$QEMU_SCRIPT" ] || cp "$TEMPLATE" "$QEMU_SCRIPT" pkill -f qemu-system-x86_64 2>/dev/null || true sleep 4 @@ -27,10 +37,10 @@ echo "$U" | sudo tee "/sys/class/mdev_bus/$MDEV_PARENT/mdev_supported_types/$MDE sed -i "s|/sys/bus/mdev/devices/[0-9a-f-]*|/sys/bus/mdev/devices/$U|" "$QEMU_SCRIPT" mkdir -p /tmp/sockets/e726ba0b-204f-4ec9-91da-983ed7f41d06 rm -f /tmp/qemu-guest-agent.sock /tmp/qemu-qmp.sock -(setsid nohup "$QEMU_SCRIPT" > /tmp/opencode-qemu.log 2>&1 &) +(setsid nohup "$QEMU_SCRIPT" > "$RUNDIR/qemu.log" 2>&1 &) sleep 6 if pgrep -f qemu-system-x86_64 >/dev/null; then - echo "VM up (mdev $U)" + echo "VM up (mdev $U) [qemu log: $RUNDIR/qemu.log]" else - echo "VM FAILED"; tail -3 /tmp/opencode-qemu.log; exit 1 + echo "VM FAILED"; tail -3 "$RUNDIR/qemu.log"; exit 1 fi -- cgit v1.2.3