From patchwork Fri Jul 3 13:48:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 6715401 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C2A92C05AC for ; Fri, 3 Jul 2015 13:49:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03CA6207F6 for ; Fri, 3 Jul 2015 13:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F2AF207F9 for ; Fri, 3 Jul 2015 13:49:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027AbbGCNtG (ORCPT ); Fri, 3 Jul 2015 09:49:06 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:34202 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbbGCNsy (ORCPT ); Fri, 3 Jul 2015 09:48:54 -0400 Received: by wiar9 with SMTP id r9so131830830wia.1 for ; Fri, 03 Jul 2015 06:48:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=2gN9FBknQPhaAxrUVARggIaYcsEEh6C5G7evcYbNiFk=; b=M2flQxa5Znz+irKP1Q7bdc12ThXc5egso/H8oLYt3V7MBTNPnx3hjaDUwcmbT1ETfT nlzpS821MgVLFe8OVj3c4ZYh20VXitQ4igXW00J/zDPKkTjyLMzkCB2JKi48k5mx5PHk 07kn3YdVHe0Uj3J/8jJWWDBoenjb/4Rj9UY0OVOyaZoO6A9UsJPddUX5wASPv60q37g0 K+ZPifoQ4fdEZXfsue5FOzfAqHf6bks15Os7g5cE0E5SCgEAupQZUBp91RcEKt9KetdP y0jmHfkox6hMnPsJNBFO/p8oRTizYzqz+j+xPh0OqLUyQlHgTv6BiePfFDF0lp6lpNts LI3w== X-Gm-Message-State: ALoCoQnqHqp2pFWoj1Rvz0DM2hIBVMJYkT5c6h2fDayYRs0nT2KYFigM79BZNzAW5gVV1dLwRPqk X-Received: by 10.180.101.233 with SMTP id fj9mr64002061wib.45.1435931332996; Fri, 03 Jul 2015 06:48:52 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by mx.google.com with ESMTPSA id ef10sm13450454wjd.49.2015.07.03.06.48.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 06:48:50 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A0ECC3E0C04; Fri, 3 Jul 2015 14:48:48 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: kvm@vger.kernel.org Cc: drjones@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH 4/7] run/arm: introduce usingkvm var and use it Date: Fri, 3 Jul 2015 14:48:44 +0100 Message-Id: <1435931327-8073-5-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1435931327-8073-1-git-send-email-alex.bennee@linaro.org> References: <1435931327-8073-1-git-send-email-alex.bennee@linaro.org> 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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This makes it easier to force KVM off in later patches. Signed-off-by: Alex Bennée --- arm/run | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arm/run b/arm/run index 6b42a2e..493ce0d 100755 --- a/arm/run +++ b/arm/run @@ -8,6 +8,16 @@ fi source config.mak processor="$PROCESSOR" +# Default to using KVM if available and on the right ARM host +usingkvm=0 +if [ -c /dev/kvm ]; then + if [ "$HOST" = "arm" ] && [ "$ARCH" = "arm" ]; then + usingkvm=1 + elif [ "$HOST" = "aarch64" ]; then + usingkvm=1 + fi +fi + qemu="${QEMU:-qemu-system-$ARCH_NAME}" qpath=$(which $qemu 2>/dev/null) @@ -39,7 +49,7 @@ chr_testdev='-device virtio-serial-device' chr_testdev+=' -device virtconsole,chardev=ctd -chardev testdev,id=ctd' # arm64 must use '-cpu host' with kvm -if [ "$(arch)" = "aarch64" ] && [ "$ARCH" = "arm64" ] && [ -c /dev/kvm ]; then +if [ $usingkvm = 1 ] && [ "$ARCH" = "arm64" ]; then processor="host" fi