diff mbox series

[v2] tests: hwsim: suppress annoying console reset from VMs

Message ID 20190205112646.13979-1-johannes@sipsolutions.net
State Accepted
Headers show
Series [v2] tests: hwsim: suppress annoying console reset from VMs | expand

Commit Message

Johannes Berg Feb. 5, 2019, 11:26 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Recently, qemu/seabios grew an annoying console/terminal reset,
which also causes my terminal to be left in a state where long
lines don't work well and less gets confused because of this.

Suppress this by suppressing all output from qemu before a new
magic string printed from inside.sh.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 tests/hwsim/vm/inside.sh | 2 ++
 tests/hwsim/vm/vm-run.sh | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Jouni Malinen Feb. 5, 2019, 10:25 p.m. UTC | #1 
On Tue, Feb 05, 2019 at 12:26:46PM +0100, Johannes Berg wrote:
> Recently, qemu/seabios grew an annoying console/terminal reset,
> which also causes my terminal to be left in a state where long
> lines don't work well and less gets confused because of this.
> 
> Suppress this by suppressing all output from qemu before a new
> magic string printed from inside.sh.

Thanks, applied.
diff mbox series

Patch

diff --git a/tests/hwsim/vm/inside.sh b/tests/hwsim/vm/inside.sh
index ac01d411c3b2..6cb6f76f0d8e 100755
--- a/tests/hwsim/vm/inside.sh
+++ b/tests/hwsim/vm/inside.sh
@@ -39,6 +39,8 @@  ln -s /proc/self/fd/0 /dev/stdin
 ln -s /proc/self/fd/1 /dev/stdout
 ln -s /proc/self/fd/2 /dev/stderr
 
+echo "VM has started up" > /dev/ttyS0
+
 # create dummy sudo - everything runs as uid 0
 mkdir /tmp/bin
 cat > /tmp/bin/sudo << EOF
diff --git a/tests/hwsim/vm/vm-run.sh b/tests/hwsim/vm/vm-run.sh
index 1712ed349647..2972fb1b0786 100755
--- a/tests/hwsim/vm/vm-run.sh
+++ b/tests/hwsim/vm/vm-run.sh
@@ -134,7 +134,8 @@  $KVM \
 	-fsdev local,security_model=none,id=fsdev-logs,path="$LOGDIR",writeout=immediate \
 	-device virtio-9p-pci,id=fs-logs,fsdev=fsdev-logs,mount_tag=logshare \
 	-monitor null -serial stdio -serial file:$LOGDIR/console \
-	-append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 cfg80211.dyndbg=+p mac80211.dyndbg=+p mac80211_hwsim.dyndbg=+p init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$argsfile"
+	-append "mac80211_hwsim.support_p2p_device=0 mac80211_hwsim.channels=$CHANNELS mac80211_hwsim.radios=7 cfg80211.dyndbg=+p mac80211.dyndbg=+p mac80211_hwsim.dyndbg=+p init=$CMD testdir=$TESTDIR timewarp=$TIMEWARP console=$KVMOUT root=/dev/root rootflags=trans=virtio,version=9p2000.u ro rootfstype=9p EPATH=$EPATH ARGS=$argsfile" | \
+	sed -u '0,/VM has started up/d'
 
 if [ $CODECOV = "yes" ]; then
     echo "Preparing code coverage reports"