From patchwork Mon Jun 24 08:51:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ren, Yongjie" X-Patchwork-Id: 2769211 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D828EC0AB1 for ; Mon, 24 Jun 2013 08:51:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD21020130 for ; Mon, 24 Jun 2013 08:51:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C398220129 for ; Mon, 24 Jun 2013 08:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751308Ab3FXIvf (ORCPT ); Mon, 24 Jun 2013 04:51:35 -0400 Received: from mga14.intel.com ([143.182.124.37]:37170 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751242Ab3FXIvf convert rfc822-to-8bit (ORCPT ); Mon, 24 Jun 2013 04:51:35 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 24 Jun 2013 01:51:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,927,1363158000"; d="scan'208";a="259241598" Received: from fmsmsx107.amr.corp.intel.com ([10.19.9.54]) by AZSMGA002.ch.intel.com with ESMTP; 24 Jun 2013 01:51:32 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX107.amr.corp.intel.com (10.19.9.54) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 24 Jun 2013 01:51:31 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.42]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.166]) with mapi id 14.03.0123.003; Mon, 24 Jun 2013 16:51:30 +0800 From: "Ren, Yongjie" To: "kvm@vger.kernel.org" CC: "gleb@redhat.com" , "pbonzini@redhat.com" Subject: [PATCH kvm-unit-tests 4/4] x86-run: replace the deprecated 'fgrep' with 'grep -F' Thread-Topic: [PATCH kvm-unit-tests 4/4] x86-run: replace the deprecated 'fgrep' with 'grep -F' Thread-Index: Ac5wuARFxgnDfWn0Q3KgfRHflQmizQ== Date: Mon, 24 Jun 2013 08:51:29 +0000 Message-ID: <1B4B44D9196EFF41AE41FDA404FC0A1001B1E1C8@SHSMSX102.ccr.corp.intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP x86-run: replace the deprecated 'fgrep' with 'grep -F'. Signed-off-by: Yongjie Ren --- x86-run | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x86-run b/x86-run index 6093a72..14ff331 100755 --- a/x86-run +++ b/x86-run @@ -3,12 +3,12 @@ qemukvm="${QEMU:-qemu-kvm}" qemusystem="${QEMU:-qemu-system-x86_64}" if - ${qemukvm} -device '?' 2>&1 | fgrep -e \"testdev\" -e \"pc-testdev\" > /dev/null; + ${qemukvm} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null; then qemu="${qemukvm}" else if - ${qemusystem} -device '?' 2>&1 | fgrep -e \"testdev\" -e \"pc-testdev\" > /dev/null; + ${qemusystem} -device '?' 2>&1 | grep -F -e \"testdev\" -e \"pc-testdev\" > /dev/null; then qemu="${qemusystem}" else @@ -18,7 +18,7 @@ else fi if - ${qemu} -device '?' 2>&1 | fgrep pci-testdev > /dev/null; + ${qemu} -device '?' 2>&1 | grep -F "pci-testdev" > /dev/null; then pci_testdev="-device pci-testdev" else @@ -26,7 +26,7 @@ else fi if - ${qemu} -device '?' 2>&1 | fgrep "pc-testdev" > /dev/null; + ${qemu} -device '?' 2>&1 | grep -F "pc-testdev" > /dev/null; then pc_testdev="-device pc-testdev -device isa-debug-exit,iobase=0xf4,iosize=0x4" else