From patchwork Mon Jun 23 12:18:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 899210 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:191c:b0:290:25b2:841c with SMTP id v28csp3839699ltt; Mon, 23 Jun 2025 05:23:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmtKSjhsK/NxGjXVTj6FIROU4i2lvmgi91VZdJwfrTNltnik3/wkHllM682WuCCp5KtUcIzA==@linaro.org X-Google-Smtp-Source: AGHT+IEE1WKgV2ABjv4AK+aX17xQlWpOJqFrytv55IQtr/BdLq0fuvEWWJHD2GU6xvxo/6aUNOIy X-Received: by 2002:a05:6214:1c4b:b0:6fa:b468:caf4 with SMTP id 6a1803df08f44-6fd0c6b0241mr172707306d6.0.1750681395841; Mon, 23 Jun 2025 05:23:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750681395; cv=none; d=google.com; s=arc-20240605; b=WjmDMYHZ1e6CHUKyZAqxDpEH9DzP+VzOIqq1Zz600EHgQkJblUYj5vPYGBCQBrVudK ofXD9wz2GX5Ixj42Dnk1gCPpp5u4ENa4vMfhM/frn+ZIOVP+GRuMmuSVCuWHdIGJs5Xi N6gFBqWMoKOYJnW86x5zc8utUfuq/n1L6HSZegSppMmuZKjX9yRGg2kC/4SuGVVSRHpz Cctv2IGJrOTNsvKiL4GATKwn2vVOPwrTN8vp8EdcWxKJmxv+DkNXaXDRwys1sq2/NnRX SqLQosTx6fTBzS3S1/dST5vuCS20Ymbr3eaPT+N1QaznTMOFRfdeEYY8da4ro2qQJUhT VFVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; fh=x5VJDl6FrykOwQuDK8d67WYnSid/uzpvpvankGNJv0o=; b=BRdAgnh40xCVB+jOm5oLTX2fX/JXuROfhIgSRctutWWFY+OzzK2yZ0nJ+L3HsY6OeN OouBD51P1UB1u+NMZwgBA5pR5vyLA5QtcNcwBHwiXbvTYNAfcxMZYkhO0gKkvQ9H4dO0 tBDQgO8FhY16ybz2zV7GBvFtj+FRvZBUO+21xcn1REunWEc4qYJLjtwRyoO/Bvtd6IBy CLXkVeXzRv9FukdjYp4wAS6eDyERGVBYofwdsXAqNlJOSRospE7BbAPCEUc1oAqHg5ZV q3JbsaGUo/H+ozEwqxcJOqvBfLrOvdK4M+iHdFlEhEtr1xQDOqVLoKED88UQ5ERCNPIF itOw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YGfZwPof; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6fd0ea8a900si70104226d6.436.2025.06.23.05.23.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jun 2025 05:23:15 -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=pass header.i=@linaro.org header.s=google header.b=YGfZwPof; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTgAj-0003wH-UJ; Mon, 23 Jun 2025 08:21:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTgAI-0003AI-Oy for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:46 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uTgAG-000147-IP for qemu-devel@nongnu.org; Mon, 23 Jun 2025 08:20:46 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so28467255e9.1 for ; Mon, 23 Jun 2025 05:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750681240; x=1751286040; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; b=YGfZwPofegnI+ZMTvpDgWncTBpOAzVVbxl5lG5PlPyTxWVvcVHAqDe8KS8GlA3wYH5 eyWZFlwIXXr5K6gPU5MY3iziTmSeBGivCZKC/2E26fob9rTHeAYs3xRENPTcYvxMWbb1 XhGdvLuY2iZWl0u5TOsxnsMOGDQCpztjxDO7TjwL4JT6oW615RsNVHiRIb6uj4sSHPAP NrqjXLTbyF0cdyGmrMkhbC/tAQgS1+T/Cm1krZVlW7TpM6Pu/Kos2/I2P7ZhDYWL/kGJ jUgdMci2h2zZJsfeCfPpntYHJLkUs66vq+PxNMX4tKu1y4r8rdKfhlhjlHlC6gWoXgdV raQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750681240; x=1751286040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xtQNZzACUXAAbylIZWuCAJaOBU6QlQnouJAN5jXvi6I=; b=QeJV6q69DBd1qr9B0tcajRFHFmfHvEeACs0J1UZ9sTUPZmdXtTGLacIONEeTXcA0pW IcyodB5R6PrjWLzjo2/SOVfuYcbj75AVUY1u4EdTfHzQTs4s62TYxpdUn6c16bCT0hyK tSJS79YLltcHixN/+iez0TYvlX5+u1JQCi28fbDtn6TcpJMhSfESgXgRqRkSF3YnRYKz ffgbQrX4DiLHdRkYR0559d6y/juVFAUhmp1oJq9+w0ty6SZ92qWIxsVvhkw7KFXEi/PW EseP6qRC6VQ2Hqq37LYttQfDuyeKmFerP5puQAcUnzb/sBtLFZPfAKJXGm5WpAKlEUr2 OBXg== X-Gm-Message-State: AOJu0YxDHWJdxKGGCVKnfaEwLpMRO+PQfJTnFad0RfoM75bJqwIWgiWD Zsd7rLTe+HY1P0HOgP2rbyMvJmAcGfgyKMpaihZh2ykNdbUoOOqSezm60dZ0HDFJ4tIoMdu6gDR 5cFvi X-Gm-Gg: ASbGncuUgsr/hTU+i/tvsySEqHjteoRfjP9hUvAQNuhtv3o4oR1/ja58A9A6kZwNdhR XzfeKowbyAgQEZyrkGWuAZtGCNB+nlppbUYduj2gsso0TMK139F+y2BYiqk08HwIU42kQFF0Zwz nzs9uupuQrQ6DdnFRCyjxSWsKX9tpqrutC+CJR0801v43biuHo6do+05wAnx50cqYKHbBT3YdW7 cVwd/4tUCuufBTOvpYvcxzKkzTzRl6n/nEcYC8RWvAu2eRJqF/LQARsR8V9ozsFHAazKbnt64xQ XRbknasHgtg8E4nGXXmMtexSsLjT3xWH+KG4s3ae+ihAovOd58am9FeA7wB7iNIefSQKLJORrey 0GplKd3twMFFSf8Wp3Oqb/mXSpAlpxG3irGkZ X-Received: by 2002:a05:6000:230e:b0:3a4:ef48:23db with SMTP id ffacd0b85a97d-3a6d12f9af7mr10894746f8f.59.1750681239899; Mon, 23 Jun 2025 05:20:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d0f104f6sm9656927f8f.12.2025.06.23.05.20.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Jun 2025 05:20:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Leif Lindholm , qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Roman Bolshakov , Paolo Bonzini , Alexander Graf , Bernhard Beschow , John Snow , Thomas Huth , =?utf-8?q?Mar?= =?utf-8?q?c-Andr=C3=A9_Lureau?= , kvm@vger.kernel.org, Eric Auger , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Cameron Esfahani , Cleber Rosa , Radoslaw Biernacki , Phil Dennis-Jordan , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PATCH v3 22/26] tests/functional: Set sbsa-ref machine type in each test function Date: Mon, 23 Jun 2025 14:18:41 +0200 Message-ID: <20250623121845.7214-23-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250623121845.7214-1-philmd@linaro.org> References: <20250623121845.7214-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org fetch_firmware() is only about fetching firmware. Set the machine type and its default console in test_sbsaref_edk2_firmware(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Leif Lindholm --- tests/functional/test_aarch64_sbsaref.py | 5 +++-- tests/functional/test_aarch64_sbsaref_alpine.py | 3 ++- tests/functional/test_aarch64_sbsaref_freebsd.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_aarch64_sbsaref.py b/tests/functional/test_aarch64_sbsaref.py index e6a55aecfac..d3402f5080a 100755 --- a/tests/functional/test_aarch64_sbsaref.py +++ b/tests/functional/test_aarch64_sbsaref.py @@ -40,8 +40,6 @@ def fetch_firmware(test): with open(path, "ab+") as fd: fd.truncate(256 << 20) # Expand volumes to 256MiB - test.set_machine('sbsa-ref') - test.vm.set_console() test.vm.add_args( "-drive", f"if=pflash,file={fs0_path},format=raw", "-drive", f"if=pflash,file={fs1_path},format=raw", @@ -68,8 +66,11 @@ class Aarch64SbsarefMachine(QemuSystemTest): def test_sbsaref_edk2_firmware(self): + self.set_machine('sbsa-ref') + fetch_firmware(self) + self.vm.set_console() self.vm.add_args('-cpu', 'cortex-a57') self.vm.launch() diff --git a/tests/functional/test_aarch64_sbsaref_alpine.py b/tests/functional/test_aarch64_sbsaref_alpine.py index 6108ec65a54..87769993831 100755 --- a/tests/functional/test_aarch64_sbsaref_alpine.py +++ b/tests/functional/test_aarch64_sbsaref_alpine.py @@ -26,8 +26,9 @@ class Aarch64SbsarefAlpine(QemuSystemTest): # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots def boot_alpine_linux(self, cpu=None): - fetch_firmware(self) + self.set_machine('sbsa-ref') + fetch_firmware(self) iso_path = self.ASSET_ALPINE_ISO.fetch() self.vm.set_console() diff --git a/tests/functional/test_aarch64_sbsaref_freebsd.py b/tests/functional/test_aarch64_sbsaref_freebsd.py index 26dfc5878bb..3cddc082f3b 100755 --- a/tests/functional/test_aarch64_sbsaref_freebsd.py +++ b/tests/functional/test_aarch64_sbsaref_freebsd.py @@ -26,8 +26,9 @@ class Aarch64SbsarefFreeBSD(QemuSystemTest): # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots def boot_freebsd14(self, cpu=None): - fetch_firmware(self) + self.set_machine('sbsa-ref') + fetch_firmware(self) img_path = self.ASSET_FREEBSD_ISO.fetch() self.vm.set_console()