From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [kvm-unit-tests PATCH 5/7] arm/run: clean-up setting of accel options Date: Fri, 3 Jul 2015 14:48:45 +0100 Message-ID: <1435931327-8073-6-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]:38153 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754950AbbGCNsz (ORCPT ); Fri, 3 Jul 2015 09:48:55 -0400 Received: by wibdq8 with SMTP id dq8so100925600wib.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: It would be nice to use --no-kvm but that flags a warning on pure-TCG builds. We echo the fact we are using TCG for the benefit of interactiv= e use. Signed-off-by: Alex Benn=C3=A9e --- arm/run | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arm/run b/arm/run index 493ce0d..a3a33b3 100755 --- a/arm/run +++ b/arm/run @@ -44,7 +44,14 @@ if $qemu $M -chardev testdev,id=3Did -initrd . 2>&1 = \ exit 2 fi =20 -M=3D'-machine virt,accel=3Dkvm:tcg' +M=3D'-machine virt' +if [ $usingkvm =3D 1 ]; then + M+=3D",accel=3Dkvm" +else + echo "Running with TCG" + M+=3D',accel=3Dtcg' +fi + chr_testdev=3D'-device virtio-serial-device' chr_testdev+=3D' -device virtconsole,chardev=3Dctd -chardev testdev,id= =3Dctd' =20 --=20 2.4.5