From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?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> References: <1435931327-8073-1-git-send-email-alex.bennee@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: drjones@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= To: kvm@vger.kernel.org Return-path: 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) In-Reply-To: <1435931327-8073-1-git-send-email-alex.bennee@linaro.org> Sender: kvm-owner@vger.kernel.org List-ID: This makes it easier to force KVM off in later patches. Signed-off-by: Alex Benn=C3=A9e --- 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=3D"$PROCESSOR" =20 +# Default to using KVM if available and on the right ARM host +usingkvm=3D0 +if [ -c /dev/kvm ]; then + if [ "$HOST" =3D "arm" ] && [ "$ARCH" =3D "arm" ]; then + usingkvm=3D1 + elif [ "$HOST" =3D "aarch64" ]; then + usingkvm=3D1 + fi +fi + qemu=3D"${QEMU:-qemu-system-$ARCH_NAME}" qpath=3D$(which $qemu 2>/dev/null) =20 @@ -39,7 +49,7 @@ chr_testdev=3D'-device virtio-serial-device' chr_testdev+=3D' -device virtconsole,chardev=3Dctd -chardev testdev,id= =3Dctd' =20 # arm64 must use '-cpu host' with kvm -if [ "$(arch)" =3D "aarch64" ] && [ "$ARCH" =3D "arm64" ] && [ -c /dev= /kvm ]; then +if [ $usingkvm =3D 1 ] && [ "$ARCH" =3D "arm64" ]; then processor=3D"host" fi =20 --=20 2.4.5