From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4E13C2D0C0 for ; Mon, 23 Dec 2019 07:44:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99F4A206CB for ; Mon, 23 Dec 2019 07:44:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99F4A206CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijIOG-00010F-NU for qemu-devel@archiver.kernel.org; Mon, 23 Dec 2019 02:44:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59953) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijINU-0000UX-2h for qemu-devel@nongnu.org; Mon, 23 Dec 2019 02:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijINP-00038d-Lp for qemu-devel@nongnu.org; Mon, 23 Dec 2019 02:43:43 -0500 Received: from relay.sw.ru ([185.231.240.75]:40842) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ijINM-0002lb-Pb; Mon, 23 Dec 2019 02:43:37 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ijING-0000ky-98; Mon, 23 Dec 2019 10:43:30 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH] iotests: fix usage -machine accel= together with -accel option Date: Mon, 23 Dec 2019 10:43:29 +0300 Message-Id: <20191223074329.21262-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Commit 6f6e1698a68ceb made these options incompatible, but it breaks iotests: -accel qtest comes from QEMUQtestMachine and -machine accel=qtest comes from QEMU_OPTIONS After this patch, -accel may still be duplicated, but this is less invasive. Also, fix extra comma in comment, added by the same 6f6e1698a68ceb Fixes: 6f6e1698a68ceb Signed-off-by: Vladimir Sementsov-Ogievskiy --- vl.c | 2 +- tests/qemu-iotests/check | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 86474a55c9..9fb859969c 100644 --- a/vl.c +++ b/vl.c @@ -2779,7 +2779,7 @@ static void configure_accelerators(const char *progname) for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) { /* * Filter invalid accelerators here, to prevent obscenities - * such as "-machine accel=tcg,,thread=single". + * such as "-machine accel=tcg,thread=single". */ if (accel_find(*tmp)) { qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp, true); diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 90970b0549..2890785a10 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -587,13 +587,13 @@ export QEMU_PROG="$(type -p "$QEMU_PROG")" case "$QEMU_PROG" in *qemu-system-arm|*qemu-system-aarch64) - export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest" ;; *qemu-system-tricore) - export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest" ;; *) - export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest" + export QEMU_OPTIONS="-nodefaults -display none -accel qtest" ;; esac -- 2.21.0