summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 21:27:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 21:27:43 -0700
commit05b1332eafba8eb250da2d2c4c52ed436a127f90 (patch)
treea97e83e9638dd7cea7e236592c4e664caaa8ce99
parentd1d9cfc330e2622f4b4e0b82d3b41a34619614d4 (diff)
parent62183dcac539a14ed0a820b8392db353d72a7d7e (diff)
downloadlinux-05b1332eafba8eb250da2d2c4c52ed436a127f90.tar.bz2
Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull single ktest fix from Steven Rostedt: "This just contains a single update by Satoru Takeuchi, which adds CLOSE_CONSOLE_SIGNAL to the kvm.conf file, as the kvm guest requires a different signal than a normal console uses" * tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf
-rw-r--r--tools/testing/ktest/examples/kvm.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/ktest/examples/kvm.conf b/tools/testing/ktest/examples/kvm.conf
index 831c7c5395f1..fbc134f9ac6e 100644
--- a/tools/testing/ktest/examples/kvm.conf
+++ b/tools/testing/ktest/examples/kvm.conf
@@ -10,6 +10,10 @@ MACHINE = Guest
# Use virsh to read the serial console of the guest
CONSOLE = virsh console ${MACHINE}
+# Use SIGKILL to terminate virsh console. We can't kill virsh console
+# by the default signal, SIGINT.
+CLOSE_CONSOLE_SIGNAL = KILL
+
#*************************************#
# This part is the same as test.conf #
#*************************************#