From patchwork Thu May 27 16:03:18 2021 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: 448864 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp644972jac; Thu, 27 May 2021 09:10:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsWGF0QU0pKRO6qs+OA3FW6scCy0Gud9NtUCyuw14r3oX1pNoIxkh6YKKa0QC8n01Go8hd X-Received: by 2002:a17:906:eb48:: with SMTP id mc8mr3460330ejb.85.1622131834496; Thu, 27 May 2021 09:10:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131834; cv=none; d=google.com; s=arc-20160816; b=w7D6Sb3Q7vuw39IfpCl8Mo8TKmPYgK6S8wUYnxQHeTn6O5bWTmaJG7KnU7b8Idepdq dKX6pKrao0MF4Hmq6i+pW5XYlaJku2gf52uYZhsV83dva4Ay5OJHqAVltC8kOG73qtR/ /7B67xJeJ88q4vh2hGhT9R/i2JkL/c4IP5Mv7pF6ORn7SH3Mf7rBqVllrP5Wf91TdDfM gR8RdOwl5VZH9kJOyTT0bxaZfF6YeYUA5Q7vTk4PEFC9iumNfYWyyDKhNXMOpZGzvFN+ jOsitu70weAOT5DsD3TTCy5xPTwhDOIKW4MMpJJNgyEAEQ9QAOHbATPQTVmpCrrC1Ors 1u6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=twXj0d635Fiz5BppYsEZg7eYPQmJqaSgQryGFfAu3oBGmW1Las1/zBgimkS7SvNwo+ tDmsTsWAaMPhJET5PaSaE/5AutQEoxJODyw1zvVLiAr/HtGtUmnQFQH6IVQXwc5sqOX4 2tJwvf7DXdIT2KE0u+xlQ7yEkVUf7PZ5ORq6uyVdj50eemYc9Is/0kyAypJ0JssJ6Ql7 czrGou8SsPtxLZexZUjibFJL/HrxRDy2kg2xpmJWAmsve3GQrNyob4GZTarzbwfp15OI vkd3wCtWEAgy2c8kR24lKeHR5lP2qXNNqN6MXKPtUyS2xFcd8qxJDOmZsqjI92rgles7 iYdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NL5HmnMu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k25si2542496ejr.183.2021.05.27.09.10.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:10:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NL5HmnMu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIaf-0007dt-HR for patch@linaro.org; Thu, 27 May 2021 12:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITt-00055i-Ms for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:33 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:54001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITq-0000Mt-DA for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:33 -0400 Received: by mail-wm1-x32d.google.com with SMTP id h3so514836wmq.3 for ; Thu, 27 May 2021 09:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=NL5HmnMuQOgYlLu6urp7nrXIZ6d7d63AILxAmlsmA0m8aZHRbaw4ZJzEoPA5zfOCLz uWwZ6GG5+6Aan7LCXf/etC0greEHayOMkKgFIzcbqqstMpWuYF54jRbUYQmU5ECCsF2L DmtQ9bIQ1axgbyJuiXkS+nMrCjszVkgqlm+fe0Y/VMfDleTX+CPzHri1D21v2/OEPb9F GnpmBBQr+mB9w7G+j0ardx3eal8j6WOrlaTY1V3Dshg1/bNIIvrxQpYqJpJGPrP7Wc1f Gmv3pE2ms51qbUT75ZVDdCy3FX63JgFxQrPeQ+5lNaxbbJWrB9nEP2zrT+n+sWB+sCyQ beYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=gUEMUsGnl9lXE/U0Qk+m8/euKbNQSOcwJ0G2H4jnlRBtQc3qaPUAv8jEpCkMW3LMpy TYg4EC4/nBEWUPKAnavdSk1aRSFJrtzsZCAXs5MA0PGzts5V3771Mu0J/2D2HJNlu+iq fLtzxtrtvM/iqjS7Zat/SQFYTFlquzHpt8ChKtwMW7GbEjYeF0P2qv7W06dmtm1BjzWg rkczXHSzlw4otqysZ4ekqNLiIBBI+tgnN+fc3bDC/EyBuTuMIGYTvOrptq1iP9rwpjdV ohdWaeYWYn0MKKP3mhH7iz7jcJqajvqK4gkG4QlDNQVnKYe0h6Z1+14FY6aAOTwkf4Md AY9A== X-Gm-Message-State: AOAM532tr28+7p6ODEo9nl9qGC0wXRUd8OFxj1ZH3Sa09uGfBFxU7LfZ 7jL4KUGGBHj/zuzsT6JhD1kdow== X-Received: by 2002:a1c:7f84:: with SMTP id a126mr9467093wmd.47.1622131407999; Thu, 27 May 2021 09:03:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z12sm4580722wmc.5.2021.05.27.09.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD8201FF91; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/6] tests/acceptance: tweak the tcg/kvm tests for virt Date: Thu, 27 May 2021 17:03:18 +0100 Message-Id: <20210527160319.19834-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Really it's only TCG that can select which GIC model you want, KVM guests should always be using the "host" version of the GIC for which QEMU already provides a handy shortcut. Make the KVM test use this and split the TCG test into it's two versions. Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Tested-by: Willian Rampazzo Reviewed-by: Willian Rampazzo diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 0d178038a0..7221452d4b 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -75,10 +75,11 @@ def add_common_args(self): self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') - def test_virt_tcg(self): + def test_virt_tcg_gicv2(self): """ :avocado: tags=accel:tcg :avocado: tags=cpu:max + :avocado: tags=device:gicv2 """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") @@ -87,29 +88,28 @@ def test_virt_tcg(self): self.add_common_args() self.launch_and_wait() - def test_virt_kvm_gicv2(self): + def test_virt_tcg_gicv3(self): """ - :avocado: tags=accel:kvm - :avocado: tags=cpu:host - :avocado: tags=device:gicv2 + :avocado: tags=accel:tcg + :avocado: tags=cpu:max + :avocado: tags=device:gicv3 """ - self.require_accelerator("kvm") - self.vm.add_args("-accel", "kvm") - self.vm.add_args("-cpu", "host") - self.vm.add_args("-machine", "virt,gic-version=2") + self.require_accelerator("tcg") + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max") + self.vm.add_args("-machine", "virt,gic-version=3") self.add_common_args() self.launch_and_wait() - def test_virt_kvm_gicv3(self): + def test_virt_kvm(self): """ :avocado: tags=accel:kvm :avocado: tags=cpu:host - :avocado: tags=device:gicv3 """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") self.vm.add_args("-cpu", "host") - self.vm.add_args("-machine", "virt,gic-version=3") + self.vm.add_args("-machine", "virt,gic-version=host") self.add_common_args() self.launch_and_wait()