From nobody Sat May 4 18:45:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1577087077; cv=none; d=zohomail.com; s=zohoarc; b=BmhatV43FYtZqxKyR0CRfTfE27DY7nWc6qv9EpHC4fEfCGalSi9/TZ5Ubsp2GUdWe+iJD4apq76xROg7Py31Gjd2VhzknANd6gnBY3EaC6+6+ZmzIklQvvw4sl7PGIw5pWHIIPv9dtvaOrCnhqSoh+QAmg8b72r9cL6h5g3vSzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577087077; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=FmPNYIjjLRjGXbiDW4YO0/PHYecDtiNHszCWQotWpKs=; b=L0zaYBTrSohArojWCF+fcL6x075fNWDwjY6hbzmTuX5tJTbYoZO2aMUuiTI6+TZ6Hq3B6+lFlpjNrQG4iEQv7kIiAaM6mLO0t4Dmbu7BNippDTdqmpZHEdVdHTwy9wtKdIyAb6AO5juV1DVxnzwC9Wz82pZO0iSdn2YgtRwrClM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577087077000770.336345439236; Sun, 22 Dec 2019 23:44:37 -0800 (PST) Received: from localhost ([::1]:54326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijIOJ-00010F-Lz for importer@patchew.org; Mon, 23 Dec 2019 02:44:35 -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: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Commit 6f6e1698a68ceb made these options incompatible, but it breaks iotests: -accel qtest comes from QEMUQtestMachine and -machine accel=3Dqtest 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 *progna= me) for (tmp =3D accel_list; !accel_initialised && tmp && *tmp; tmp++)= { /* * Filter invalid accelerators here, to prevent obscenities - * such as "-machine accel=3Dtcg,,thread=3Dsingle". + * such as "-machine accel=3Dtcg,thread=3Dsingle". */ if (accel_find(*tmp)) { qemu_opts_parse_noisily(qemu_find_opts("accel"), *tmp, tru= e); 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=3D"$(type -p "$QEMU_PROG")" =20 case "$QEMU_PROG" in *qemu-system-arm|*qemu-system-aarch64) - export QEMU_OPTIONS=3D"-nodefaults -display none -machine virt,acc= el=3Dqtest" + export QEMU_OPTIONS=3D"-nodefaults -display none -machine virt -ac= cel qtest" ;; *qemu-system-tricore) - export QEMU_OPTIONS=3D"-nodefaults -display none -machine tricore_= testboard,accel=3Dqtest" + export QEMU_OPTIONS=3D"-nodefaults -display none -machine tricore_= testboard -accel qtest" ;; *) - export QEMU_OPTIONS=3D"-nodefaults -display none -machine accel=3D= qtest" + export QEMU_OPTIONS=3D"-nodefaults -display none -accel qtest" ;; esac =20 --=20 2.21.0