From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs3tA-0006oh-SE for qemu-devel@nongnu.org; Fri, 30 Oct 2015 03:14:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs3t7-0007W7-DS for qemu-devel@nongnu.org; Fri, 30 Oct 2015 03:14:16 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:38648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs3t6-0007Vk-Qt for qemu-devel@nongnu.org; Fri, 30 Oct 2015 03:14:13 -0400 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Oct 2015 17:14:06 +1000 Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id A66BC2BB0054 for ; Fri, 30 Oct 2015 18:14:04 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t9U7DlGE12517578 for ; Fri, 30 Oct 2015 18:13:59 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t9U7DSDi001241 for ; Fri, 30 Oct 2015 18:13:29 +1100 From: Bo Tu Date: Fri, 30 Oct 2015 15:13:03 +0800 Message-Id: <1446189186-23104-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v1 1/4] qemu-iotests: refine common.config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, silbe@linux.vnet.ibm.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com Be easier to read, and be slightly shorter. Suggested-By: Sascha Silbe Reviewed-by: Sascha Silbe Signed-off-by: Bo Tu --- tests/qemu-iotests/common.config | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index 596bb2b..0a165e8 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -129,10 +129,9 @@ export QEMU_IO=_qemu_io_wrapper export QEMU_NBD=_qemu_nbd_wrapper default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}') -default_alias_machine=$($QEMU -machine \? |\ - awk -v var_default_machine="$default_machine"\)\ - '{if ($(NF-2)=="(alias"&&$(NF-1)=="of"&&$(NF)==var_default_machine){print $1}}') -if [ ! -z "$default_alias_machine" ]; then +default_alias_machine=$($QEMU -machine \? \ + | grep -F "(alias of ${default_machine})" |cut -d ' ' -f 1 |head -n 1) +if [ -n "$default_alias_machine" ]; then default_machine="$default_alias_machine" fi -- 2.3.0