From patchwork Wed Jun 23 10:27:42 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: 465892 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1601086jao; Wed, 23 Jun 2021 03:29:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5Svvk9JRsFkESW4jyrKGiJF54QBQHQH1wJ5s8dX27wX3wByN29ZaOhSKdEW1cQsmJ2Vej X-Received: by 2002:a02:44c6:: with SMTP id o189mr8347417jaa.90.1624444176281; Wed, 23 Jun 2021 03:29:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624444176; cv=none; d=google.com; s=arc-20160816; b=Zndd2BYHbf3jPBeEz05d6CuL9LIATM6YDOA4mRHaxzdlIITQkhiW+XSB1H7liqqz0g 0gYiX9BwBki0Y4jEOqDrH7gmo5nGO5cCwZpoKm+ELBl64FiKiKpiBJCZjIk5Uu9vGbVk QghvLhzUShvvvHWZcXvalDpzOuVVtFSX1FCfFyPSbQgYplG4LCWZ6HRj5RtvdKJp8oLR XbAmnEWKucFeFGkM45DGlG8dqXGGgda9SnVB5HPiSVi8EnwfK/4s6iljW7JAZ0lSVwXE RZSzEvgAwNvCqnk8N7lqM6/yvcW7eSI1RFiD96fhraQLCwPvuzux5mvPsmphB+DPDQo+ fpiQ== 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=I9PsUDVxk3C7pgdDQmjsngPKlAX7gw8tVzdh0nQKkN8=; b=RJ5GEGsC+UAmzLYGvMVdJSMK9Y6HAPcip/2wCLi9VGmdxqq6QY0Q99a24PJtgVecgz K8933ojr442LTHbK9J/hSn0hpjlyUrV0ycqQ4GOuunAQ2DfvCbJVflNzFxkrsz1dI2If GVpWUVAbcJUU2GbLDDh/pKa4e2dYliNZ8U16aUGjC3ct/l8dIaQdgvr4AOTPx8IAg2A4 wdHQzjOZa85pbZmQ8QFyTYBmdnbER7OuvgCurIzsE1igNooDcfoVcRzTD7mARRLHyrem v55zEwdkyIsgrk9Jczo49713FkRPg7xY80gpIUWrysf5RTJEtNOdzxut4ORubNX3slGX bi5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UfGuxYnX; 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 e7si18365957ilq.68.2021.06.23.03.29.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jun 2021 03:29:36 -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=UfGuxYnX; 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]:40920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lw08V-0003Au-NX for patch@linaro.org; Wed, 23 Jun 2021 06:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lw06y-00019x-P9 for qemu-devel@nongnu.org; Wed, 23 Jun 2021 06:28:01 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:40697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lw06s-0001XX-1I for qemu-devel@nongnu.org; Wed, 23 Jun 2021 06:28:00 -0400 Received: by mail-wr1-x433.google.com with SMTP id y7so2029159wrh.7 for ; Wed, 23 Jun 2021 03:27:53 -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=I9PsUDVxk3C7pgdDQmjsngPKlAX7gw8tVzdh0nQKkN8=; b=UfGuxYnXxx9d8qbbBFYmOJR3B9xCX0OONi5lV5M6zxP/YPJjlaj/ThngwEVNVQ0GzB +5hrqekJRgkVyoqZ62JQlhB9eaKla1yGVpfjA0BpfM6HCzA0iVkRhU0EZ7DFY+lK49P2 vDmfNWNygtprfIE6aDq112wGltok45NGvKIuojl64vrYJM0UXht8HZm/lu0Ewl12f99o HEVeQhrtW3CJFSJXQRPvoOxbDPkjmOAQJe4moPOf6wOmJmgRpYGOM5h2LQrM10aLnJWP DvHw05RVfmlObTNll+kxh/+pc4Nm6xKZlNtb7Y0ySWveDNC5Rdl39oEDVehT0JGCPO5k lIZw== 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=I9PsUDVxk3C7pgdDQmjsngPKlAX7gw8tVzdh0nQKkN8=; b=dA+PVe6F3O5zudgI3wVHX2UIs0fUIZ8YcmWklhQB4rYLLYoAdJxBrzeVs++YCtZ+6U 1k/00dkqRjjfLKu/oP7uLUFJw4yIbHwA8/DKkGf/RzR21jCYyrPmoNx92+8OpCH1GUwD nB9tHrDa+wTgqJ0wgMUHZuG4Ce9WguoK6QITsPYYQuEiuGFgBClm068eljhFP2F3Khqb 0zDyH/AvEBZBo8r+b94vY/6UqhS/n1YOOPbYRCjrOBVS8+7LoAniiGbwTrJ2Ad5GHs5g cv0ONtTLJVrtBdtJzWEwT8xCYbcnroIFzg/7/FHGGCLi9ZDpF2qhkjxk18Tsosa97B12 sNrQ== X-Gm-Message-State: AOAM5310bZ9ZQg3Xf2Yt2ontoNqZtAJhYtmLFfD6Z7FC4Y5zusgWLUPT IM4h/UVeRXT1GQwsrzgRlxjcjg== X-Received: by 2002:a5d:4e52:: with SMTP id r18mr4900033wrt.372.1624444071786; Wed, 23 Jun 2021 03:27:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c12sm2643750wrr.90.2021.06.23.03.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 03:27:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BD8961FF87; Wed, 23 Jun 2021 11:27:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/8] tests/acceptance: tweak the tcg/kvm tests for virt Date: Wed, 23 Jun 2021 11:27:42 +0100 Message-Id: <20210623102749.25686-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210623102749.25686-1-alex.bennee@linaro.org> References: <20210623102749.25686-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Cleber Rosa 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: Willian Rampazzo diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 314370fd1f..4c8a5994b2 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(set_up_ssh_connection=False) - 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(set_up_ssh_connection=False) - 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(set_up_ssh_connection=False)