From patchwork Tue Jul 7 07:03:33 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: 6730411 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 5672DC05AD for ; Tue, 7 Jul 2015 07:03:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B9802052A for ; Tue, 7 Jul 2015 07:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 858C320735 for ; Tue, 7 Jul 2015 07:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbbGGHDv (ORCPT ); Tue, 7 Jul 2015 03:03:51 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:32842 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756014AbbGGHDn (ORCPT ); Tue, 7 Jul 2015 03:03:43 -0400 Received: by wiwl6 with SMTP id l6so304910122wiw.0 for ; Tue, 07 Jul 2015 00:03:42 -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=PCWDgeFEZc2JA37NuTnuPU/pJluNwCnQ+q0AZzCcmtg=; b=BTuSeb1wD6L+crjnoFoGfbgBP5QQ0OKY8AtcEwLHjht1xy7H6PMN0X+Q46Gon+eOLv H/nRARJsmazdBQCtSClDzwfpZcQepufNur7LT+VOoi4xcm3fH8Zm6Z1roREvgAhcJTJe qBo1FZXAYzPHs2tDOJNg7U3tayCUkOhbCXSgcUkBoOJgOiUlBk1TKVxBx/rJ8JFCh7xc 9o4MAb+qk55r6cIuZ6X+1Z/FS8VzBcaf7/nlBMQE5qrja8q3yjmSG5QCT8+C/Ug9oW1i 8t20J9OCvqb5wP78Cs9qOtp0pyY2UY7McQa6CW8r/kuS1UWp0FRHv0HwvYkwEeJsyWGV iKvA== X-Gm-Message-State: ALoCoQlOlnKhoRcoP2qVILPQzooQvKXyExWpTuDlFe8PxizYJsbaYa7SOk4TYrwgFdi4TfvjWYt2 X-Received: by 10.194.203.138 with SMTP id kq10mr5644242wjc.124.1436252622348; Tue, 07 Jul 2015 00:03:42 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by mx.google.com with ESMTPSA id ha4sm50894135wib.0.2015.07.07.00.03.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jul 2015 00:03:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 14F803E2214; Tue, 7 Jul 2015 08:03:39 +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 v2 4/4] arm/run: clean-up setting of accel options Date: Tue, 7 Jul 2015 08:03:33 +0100 Message-Id: <1436252613-1540-5-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436252613-1540-1-git-send-email-alex.bennee@linaro.org> References: <1436252613-1540-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.7 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 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 interactive use. Signed-off-by: Alex Bennée --- v2 - rm redundant M= statement --- arm/run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arm/run b/arm/run index 493ce0d..7266004 100755 --- a/arm/run +++ b/arm/run @@ -32,6 +32,12 @@ if ! $qemu -machine '?' 2>&1 | grep 'ARM Virtual Machine' > /dev/null; then fi M='-machine virt' +if [ $usingkvm = 1 ]; then + M+=",accel=kvm" +else + echo "Running with TCG" + M+=',accel=tcg' +fi if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then echo "$qpath doesn't support virtio-console for chr-testdev. Exiting." @@ -44,7 +50,6 @@ if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \ exit 2 fi -M='-machine virt,accel=kvm:tcg' chr_testdev='-device virtio-serial-device' chr_testdev+=' -device virtconsole,chardev=ctd -chardev testdev,id=ctd'