diff options
| author | Milosz Wasilewski <milosz.wasilewski@hackbox.linaro.org> | 2014-11-13 12:51:09 +0000 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@hackbox.linaro.org> | 2014-11-13 12:51:09 +0000 |
| commit | 61146b5add5041d897ff270044d047495cc45110 (patch) | |
| tree | 5505b10718f58028bf3210c399df342448e7360a /rcutorture/bin/kvm-test-1-run.sh | |
| parent | e14eb051ff73ab8692770762adf44045ba092398 (diff) | |
Update to commit: 04689e749b7ec156291446028a0ce2e685bf3855
from repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
branch: master
Diffstat (limited to 'rcutorture/bin/kvm-test-1-run.sh')
| -rwxr-xr-x | rcutorture/bin/kvm-test-1-run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rcutorture/bin/kvm-test-1-run.sh b/rcutorture/bin/kvm-test-1-run.sh index 0f69dcb..f6b2b47 100755 --- a/rcutorture/bin/kvm-test-1-run.sh +++ b/rcutorture/bin/kvm-test-1-run.sh @@ -6,7 +6,7 @@ # Execute this in the source tree. Do not run it as a background task # because qemu does not seem to like that much. # -# Usage: sh kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args +# Usage: kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args # # qemu-args defaults to "-nographic", along with arguments specifying the # number of CPUs and other options generated from @@ -140,6 +140,7 @@ fi # Generate -smp qemu argument. qemu_args="-nographic $qemu_args" cpu_count=`configNR_CPUS.sh $config_template` +cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"` vcpus=`identify_qemu_vcpus` if test $cpu_count -gt $vcpus then @@ -214,7 +215,7 @@ then fi if test $kruntime -ge $((seconds + grace)) then - echo "!!! Hang at $kruntime vs. $seconds seconds" >> $resdir/Warnings 2>&1 + echo "!!! PID $qemu_pid hung at $kruntime vs. $seconds seconds" >> $resdir/Warnings 2>&1 kill -KILL $qemu_pid break fi |