From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36882)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1YKqP1-0007aM-N4
	for qemu-devel@nongnu.org; Mon, 09 Feb 2015 10:37:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1YKqOw-0008RY-Dg
	for qemu-devel@nongnu.org; Mon, 09 Feb 2015 10:37:35 -0500
Received: from mx1.redhat.com ([209.132.183.28]:36475)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1YKqOw-0008Pz-5x
	for qemu-devel@nongnu.org; Mon, 09 Feb 2015 10:37:30 -0500
Message-ID: <54D8D432.5010806@redhat.com>
Date: Mon, 09 Feb 2015 10:37:22 -0500
From: Max Reitz <mreitz@redhat.com>
MIME-Version: 1.0
References: <1423256778-3340-1-git-send-email-mreitz@redhat.com>
	<1423256778-3340-3-git-send-email-mreitz@redhat.com>
	<20150209150133.GC2076@stefanha-thinkpad.redhat.com>
In-Reply-To: <20150209150133.GC2076@stefanha-thinkpad.redhat.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 2/3] iotests: Add "wait" functionality
 to _cleanup_qemu
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

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.

Max