From patchwork Tue May 31 10:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= X-Patchwork-Id: 9144263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D679607D6 for ; Tue, 31 May 2016 10:54:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CFEC281B4 for ; Tue, 31 May 2016 10:54:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11C4E27D17; Tue, 31 May 2016 10:54:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB05927D17 for ; Tue, 31 May 2016 10:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbcEaKya (ORCPT ); Tue, 31 May 2016 06:54:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56120 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752677AbcEaKy2 (ORCPT ); Tue, 31 May 2016 06:54:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39D9C64094 for ; Tue, 31 May 2016 10:54:28 +0000 (UTC) Received: from w541.redhat.com (vpn1-6-195.ams2.redhat.com [10.36.6.195]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4VAsLtm027101; Tue, 31 May 2016 06:54:26 -0400 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: kvm@vger.kernel.org, drjones@redhat.com, pbonzini@redhat.com, lvivier@redhat.com, ldoktor@redhat.com Subject: [PATCH] scripts/runtime: Adjust the premature_failure check Date: Tue, 31 May 2016 12:54:17 +0200 Message-Id: <1464692057-19348-2-git-send-email-ldoktor@redhat.com> In-Reply-To: <1464692057-19348-1-git-send-email-ldoktor@redhat.com> References: <1464692057-19348-1-git-send-email-ldoktor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 31 May 2016 10:54:28 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The premature_failure check fails on qemu-system-ppc64 as it uses different message. This patch modifies the condition so it works (hopefully) for all archs. Signed-off-by: Lukáš Doktor --- scripts/runtime.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 6c4c800..886814b 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -17,7 +17,7 @@ premature_failure() local log="$(eval $(get_cmdline _NO_FILE_4Uhere_) 2>&1)" local last_line=$(tail -1 <<< "$log") - echo "$last_line" | grep -qi "could not load kernel" && + echo "$last_line" | grep "_NO_FILE_4Uhere_" | grep -qi "no such file" && return 1 RUNTIME_log_stderr <<< "$log"