Skip to content

Commit

Permalink
Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Apr 5, 2014
2 parents d1d9cfc + 62183dc commit 05b1332
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tools/testing/ktest/examples/kvm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
#*************************************#
Expand Down

0 comments on commit 05b1332

Please sign in to comment.