On Mon, Feb 09, 2015 at 10:37:22AM -0500, Max Reitz wrote: > On 2015-02-09 at 10:01, Stefan Hajnoczi wrote: > >On Fri, Feb 06, 2015 at 04:06:17PM -0500, Max Reitz wrote: > >>diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu > >>index 8e618b5..4e1996c 100644 > >>--- a/tests/qemu-iotests/common.qemu > >>+++ b/tests/qemu-iotests/common.qemu > >>@@ -187,13 +187,23 @@ function _launch_qemu() > >> # Silenty kills the QEMU process > >>+# > >>+# If $wait is set to anything other than the empty string, the process > >>will not > >>+# be killed but only waited for, and any output will be forwarded to > >>stdout. If > >>+# $wait is empty, the process will be killed and all output will be > >>suppressed. > >> function _cleanup_qemu() > >> { > >> # QEMU_PID[], QEMU_IN[], QEMU_OUT[] all use same indices > >> for i in "${!QEMU_OUT[@]}" > >> do > >>- kill -KILL ${QEMU_PID[$i]} 2>/dev/null > >>+ if [ -z "${wait}" ]; then > >Is the global variable (with a common name) necessary? > > > >function _cleanup_qemu() > >{ > > wait=$1 > >... > > > >_cleanup_qemu > >OR > >_cleanup_qemu --wait > > Well, it's probably not necessary, but it conforms with the _launch_qemu > ($qemu_comm_method), the _send_qemu_cmd ($qemu_error_not_set), and the > _timed_wait_for ($silent) interfaces.
Okay, let's stay consistent. Stefan
pgpIsBxWkj5qB.pgp
Description: PGP signature