From patchwork Tue Jan 7 16:52:02 2025 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: 13929370 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A075CE77199 for ; Tue, 7 Jan 2025 16:55:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVCrH-0000x3-PR; Tue, 07 Jan 2025 11:55:11 -0500 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 1tVCpb-0005D6-Lx for qemu-devel@nongnu.org; Tue, 07 Jan 2025 11:53:30 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tVCob-0005xU-HV for qemu-devel@nongnu.org; Tue, 07 Jan 2025 11:53:27 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43618283dedso156682895e9.3 for ; Tue, 07 Jan 2025 08:52:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736268744; x=1736873544; 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=oOL1w6DXYhRHKCvs8ew1RtJiJh2Nk45cuCcCN9iEMs4=; b=bJVCpxmCRYrxELIH/R/TUy4UkND6KIfHczhvWalzoEiB6I1WEXLLvKIx8UbNfGf3vX d3kAcCiJlu7Z8P7zq4XThF8lAH8HRRNmH8mE6DM9dpafFSWL1KC4mMcGl4DJUVs5yfV2 pZdjB/vLVS8FGTZbfCldMmSzVf514UWLzcUX3P9dmlVfKuaBwXauhYjKWQASbGlX98rQ m7Ki0qzuGf0EGW3+1xqwxcZOQwT92PnhcEVQkvGBJdUaMuDDNx/mOFTWtgQxMi6xA3m1 WPSq5UMCvImCgOvT6k/WA5JebfboEiVHgNoeSs5TS9+s+5CzMml5rk4h7pqPBR6btWNT eLxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736268744; x=1736873544; 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=oOL1w6DXYhRHKCvs8ew1RtJiJh2Nk45cuCcCN9iEMs4=; b=XyGyaYnW5OPdyBBI+OL6TgptS8VoGJkc74N5yfUE19ehAWkIF3mmWm9IADF/cMIb50 TxDCzM+S/NF0l07U+iSUfs3eRMMvwFHYI911U5gfx/YcHO2XddHU9KYkaAUPFDa4zWaK wxBRi+smNmrWJu4/fFhdUgQa/Twk4k3a0gvr2rP6DdQDIHQdwuOBqNFhns2O2LLtIm6S JT40Pw4RwzQQ0SMMCueoVGNbZ31TIx3yFn2LudZzdg/Or+nWmWej1Fi1En33lBnZHnDK O8urJihDhMRYd4LQl15h1P4Q7ner1lEbkU1duWuaNLrHJw2En0GdqAgLw8FJSJgWcdAv jo7w== X-Gm-Message-State: AOJu0YyXWh+RRzcssNrSklnF8VYrWblTMfu9aS3vVls3k3wE79Zn5ZQl jtir0ci6YkNXPD/fXDkKg4Yqaw4v2alyMmSphbvacLyEFmpU5KUJ2RicCfAJwZw= X-Gm-Gg: ASbGncsB4TyShyYeLZHm6owkhbcHYxicUDkNhdhPk4AqK/SJf4ztAJtOaEUVpM8qStn S7MCIvI0R8Gb6/D/tFEgYV42TMkXTtHTbXLLPq2APiqcxsFScZwKNoE4NFt7FtR5RBBK5JzWp/d Z8ypANMAeQyDnwekxh16DCucDR+dOQYkcpvChi0lLaRPjy/pmTMj/AM3yCAUnS7xFsGKTASaFKh 2M25/Ut8egaFz2pgaaRu6m2qY/cJGu4B7DJAiIEfIkHfQ9OIFbRvTM= X-Google-Smtp-Source: AGHT+IFNDzjgNio99KjA4CNrZqt044tR+yPTj4ZI4LY/EjTtw+XPBEW4crdWNJqJULnvsKp3pZBJ4A== X-Received: by 2002:a05:600c:1c1a:b0:434:a746:9c82 with SMTP id 5b1f17b1804b1-4366854725cmr528081785e9.5.1736268744136; Tue, 07 Jan 2025 08:52:24 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b1143dsm633698265e9.18.2025.01.07.08.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 08:52:17 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 384DD60132; Tue, 7 Jan 2025 16:52:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Beraldo Leal , Ed Maste , Halil Pasic , qemu-ppc@nongnu.org, John Snow , Radoslaw Biernacki , Nicholas Piggin , Markus Armbruster , Leif Lindholm , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Bin Meng , Daniel Henrique Barboza , Marcel Apfelbaum , qemu-riscv@nongnu.org, Christian Borntraeger , Wainer dos Santos Moschetta , qemu-s390x@nongnu.org, Alistair Francis , Liu Zhiwei , Fabiano Rosas , Weiwei Li , Harsh Prateek Bora , qemu-arm@nongnu.org, Li-Wen Hsu , Palmer Dabbelt , Daniel Henrique Barboza , Richard Henderson , Cleber Rosa , Marcin Juszkiewicz , Peter Maydell , Laurent Vivier , Aurelien Jarno , Eric Farman , Pavel Dovgalyuk , Jiaxun Yang , Thomas Huth , Laurent Vivier , Joel Stanley , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Bernhard Beschow , "Michael S. Tsirkin" Subject: [PATCH v3 24/29] tests/vm: fix build_path based path Date: Tue, 7 Jan 2025 16:52:02 +0000 Message-Id: <20250107165208.743958-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250107165208.743958-1-alex.bennee@linaro.org> References: <20250107165208.743958-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We no longer need to go into the per-arch build directories to find the build directories binary. Lets call it directly. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/vm/basevm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4a1af04b9a..6f3f2e76df 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -520,8 +520,7 @@ def get_qemu_path(arch, build_path=None): if "QEMU" in os.environ: qemu_path = os.environ["QEMU"] elif build_path: - qemu_path = os.path.join(build_path, arch + "-softmmu") - qemu_path = os.path.join(qemu_path, "qemu-system-" + arch) + qemu_path = os.path.join(build_path, "qemu-system-" + arch) else: # Default is to use system path for qemu. qemu_path = "qemu-system-" + arch