diff options
Diffstat (limited to 'tools/guest-diag')
| -rw-r--r-- | tools/guest-diag/pin_gr_stream.py | 7 | ||||
| -rwxr-xr-x | tools/guest-diag/semfix_uvmt.py | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/tools/guest-diag/pin_gr_stream.py b/tools/guest-diag/pin_gr_stream.py index 22c202b..c1ef7b2 100644 --- a/tools/guest-diag/pin_gr_stream.py +++ b/tools/guest-diag/pin_gr_stream.py @@ -45,8 +45,11 @@ def install_and_start(): b64 = subprocess.run(["base64", "-w0"], stdin=f, capture_output=True, text=True).stdout cmd = ("echo '%s' | base64 -d > /tmp/guest_pin_stream.py; " - "[ -f /tmp/guest_pin_stream.pid ] && sudo kill " - "$(cat /tmp/guest_pin_stream.pid) 2>/dev/null; " + "if [ -f /tmp/guest_pin_stream.pid ]; then " + "p=$(cat /tmp/guest_pin_stream.pid 2>/dev/null); " + "[ -n \"$p\" ] && grep -q guest_pin_stream " + "/proc/$p/cmdline 2>/dev/null && sudo kill $p 2>/dev/null; " + "fi; " "sudo rm -f /tmp/guest_pin_stream.pid; " "sudo setsid nohup python3 /tmp/guest_pin_stream.py %d %d %s %s %s " ">/tmp/guest_pin_stream.log 2>&1 & sleep 2; " diff --git a/tools/guest-diag/semfix_uvmt.py b/tools/guest-diag/semfix_uvmt.py index 12577ab..0d31394 100755 --- a/tools/guest-diag/semfix_uvmt.py +++ b/tools/guest-diag/semfix_uvmt.py @@ -115,11 +115,17 @@ def state_str(sem, st): def dmesg_releases(seen): - """Print/append new host-decoded releases (sema-push lines).""" + """Print/append new host-decoded releases (sema-push lines). + + Only lines after the last "sema-svc: thread started" marker count: dmesg + keeps the previous module load's lines and the old client's releases. + """ try: r = subprocess.run( ["sudo", "-n", "sh", "-c", - "dmesg -T | grep 'sema-push' | tail -300"], + "dmesg -T | awk '/sema-svc: thread started/{n=NR} " + "{l[NR]=$0} END{for(i=n+1;i<=NR;i++) print l[i]}' " + "| grep 'sema-push' | tail -300"], capture_output=True, text=True, timeout=10) except Exception: return |