From patchwork Thu May 19 03:42:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boqun Feng X-Patchwork-Id: 623791 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r9H6Y5kCZz9vL3 for ; Thu, 19 May 2016 13:46:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Tqb51/EW; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3r9H6Y4g6zzDqNJ for ; Thu, 19 May 2016 13:46:13 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Tqb51/EW; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3r9GzJ0BXzzDqLj for ; Thu, 19 May 2016 13:39:56 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Tqb51/EW; dkim-atps=neutral Received: by mail-io0-x242.google.com with SMTP id i75so12974964ioa.2 for ; Wed, 18 May 2016 20:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lCPvBzojVkZS7wOY0eV1lrWZsHRtmxQ+/zLiYSE3Vj0=; b=Tqb51/EW9f43qnbQU4wsturWph3K9dtfpHnxXaZtaMGdKnQwf0rML99fP7Byy2NFMk +rCoT5GpIVrEGuOS3FzLfo/xV2pP+NVNnzUZA4JJgZvUXksxqrEMJiJyuteUM0CJZ66v JBYJ4X3dnThYdS8SlYKh6u59XDwO1IzqOH8YhbiIpZ2QY2CPnv5igrYEwi9EdxpSRjc6 Ax0GW5bRd6rwLgkIypsZrOIE63PfL7zRFqhUfexxTGl7nQEZbED9e4TZrE4TEJPhpWMj YWEH5Fs+oEXEBB2zN1OD3kenWB2AQZLacV/GqnsCHEQ7SjjR0un5sXXRl/soZ23oynbn rjdg== 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; bh=lCPvBzojVkZS7wOY0eV1lrWZsHRtmxQ+/zLiYSE3Vj0=; b=b40pP5vOtB5ZWgA6NrW3rrQkPpBmC/nJWDRMSFsoGAmMoVYcQBhQfvgA3i52IkcP5F 9/tsYYDaD8bLivu3RUjMfc79B0sZDxtmHafRUIpgvldOMUZ3d4uJkQUUgT/a5jSKhfPP Ot0C3dSzjX9hQHM9ZJmrCvDdqlZsxM2jtnjjFo9YsonNFG96r1hwuRjaplP+PnX6EdeF khdEaYTcjXi5u1BFV/iqEIavpny4acgG9pbm2iicbOAL0RYAhu7LHZ6w/PSpbnLW6jPY jiRTLu3J+gr5K9nR6CIU6hVTZw1lY1hEXNnmfeN8jrOH1SbTR567bWrDwWZL+re4xBNg lfxA== X-Gm-Message-State: AOPr4FUyF95pIhvz+BXzDScmkg59EFEQJGeLqp9MmIHuDhINnS7m22vii1Ey9zRwg6YIJw== X-Received: by 10.36.254.194 with SMTP id w185mr1064409ith.4.1463629194185; Wed, 18 May 2016 20:39:54 -0700 (PDT) Received: from localhost ([106.38.0.83]) by smtp.gmail.com with ESMTPSA id u66sm3777991itc.21.2016.05.18.20.39.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2016 20:39:53 -0700 (PDT) From: Boqun Feng To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 3/4] rcutorture: Make -soundhw a x86 specific option Date: Thu, 19 May 2016 11:42:23 +0800 Message-Id: <1463629344-20471-4-git-send-email-boqun.feng@gmail.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1463629344-20471-1-git-send-email-boqun.feng@gmail.com> References: <1463629344-20471-1-git-send-email-boqun.feng@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boqun Feng , Lai Jiangshan , Josh Triplett , Steven Rostedt , Mathieu Desnoyers , "Paul E. McKenney" MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The option "-soundhw pcspk" gives me a error on PPC as follow: qemu-system-ppc64: ISA bus not available for pcspk , which means this option doesn't work on ppc by default. So simply make this an x86-specific option via identify_qemu_args(). Signed-off-by: Boqun Feng --- tools/testing/selftests/rcutorture/bin/functions.sh | 1 + tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh index 616180153208..77fdb46cc65a 100644 --- a/tools/testing/selftests/rcutorture/bin/functions.sh +++ b/tools/testing/selftests/rcutorture/bin/functions.sh @@ -171,6 +171,7 @@ identify_qemu_append () { identify_qemu_args () { case "$1" in qemu-system-x86_64|qemu-system-i386) + echo -soundhw pcspk ;; qemu-system-ppc64) echo -enable-kvm -M pseries -cpu POWER7 -nodefaults diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh index 46cb6bc098bd..d7a3de26dd11 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh @@ -8,9 +8,9 @@ # # Usage: kvm-test-1-run.sh config builddir resdir seconds qemu-args boot_args # -# qemu-args defaults to "-enable-kvm -soundhw pcspk -nographic", along with -# arguments specifying the number of CPUs and other -# options generated from the underlying CPU architecture. +# qemu-args defaults to "-enable-kvm -nographic", along with arguments +# specifying the number of CPUs and other options +# generated from the underlying CPU architecture. # boot_args defaults to value returned by the per_version_boot_params # shell function. # @@ -148,7 +148,7 @@ then fi # Generate -smp qemu argument. -qemu_args="-enable-kvm -soundhw pcspk -nographic $qemu_args" +qemu_args="-enable-kvm -nographic $qemu_args" cpu_count=`configNR_CPUS.sh $config_template` cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"` vcpus=`identify_qemu_vcpus`