From nobody Tue Feb 10 03:38:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1636122870; cv=none; d=zohomail.com; s=zohoarc; b=egtv4//rzl4b+5fQLM+0FNRbvAegP4CWddJW3f1/z9dwgRPmUtrVx7klXZ9N0NuYB+WWxEE1JQviylSYUj71lxgy6byRRYFHhUprp3GtXDpY51CUeJ/XaHSbhbcpwaW4+zLQqQIQcaQePoFDfqr8mpbgvmS+g9TVdiaWE9Yl5Cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636122870; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SUXnrrtPJ+o1kaG8ccIu9sfTqlabICw/ainFxnAC26E=; b=AtKFungyvMDXR96xIgNEOAYiYrbx4aZxFWkW6KG5xI0DKGuSDFeXrHS0Dx2/s0DE24/UgfMmLBIz0yLp56LuVEuTRivCbe4Ew9ZtqjdSpNEWtb0t4HfVAg3Zrq1IZECbDu+aMYIuk6O1XV8bUELI/lopXchE1iUNCUApDBPCZuQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1636122870342927.0434176940984; Fri, 5 Nov 2021 07:34:30 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso6613137wmf.0 for ; Fri, 05 Nov 2021 07:34:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id l8sm12698557wmc.40.2021.11.05.07.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 07:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SUXnrrtPJ+o1kaG8ccIu9sfTqlabICw/ainFxnAC26E=; b=KESZbC21w8CZbg+EUlmh/k6lGcN+vd2LYqIRQ53fu50TuL2wTlCH8+UM8R18tYQNSG wYmCQ8Nt4z47nyVmDuxfwTzzWsu+9MpvZAUSuUPkLqqXialSJk+Is3nV3cbPOwk2uLjZ WBELNwXVl75BlHr2igvXQQIGC8Kx3V6bK68uwBymxMCwIgBzqwzN3t90aVWWyMQ4YMT8 k7e+G/0yD6kcyufJoWAyyCt4NyOXetoglyuKtsvHUPS37Wi0N8WfoDAI7URLrEinL3Zh wPhxUz6KunNPpOcbnYWnSEdYxUiO3qRWB8GbAqrnCr+ILbCFC4Oe5pVKZwH0qSdZpgqf HgPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SUXnrrtPJ+o1kaG8ccIu9sfTqlabICw/ainFxnAC26E=; b=1V7rPSAP97E8dLanE+xxsEeiI1dqNZjf+RAqdHyaY0sBgM1vv/zM8L2RacAKiR6HY5 bXcvjfj08ujaoXbPtkbOCtbseAUbQ5UmqpIuBlnmdXzJLRt2Ax1dbpmQlBkAO1jY2TWD 10OtwNt/nezvPYZV+7/HTRR8ouitdHcrfiKJ6QIp+glUX7Mfkd7Q9n2PJR64WUoFYPTC CxBLcFUK1JUnzj4J+52h3I2WQrcYJGXCzCNFDo/jcRrrsK/49xUyVqwiNxH3PUcxlONv RG0F30Sw32B3Tkv7dS/4xH3d7FNgEhXkRj2lFdfqZWhVoCSm+nNRaDKDt5IJevnWSDKz vxQA== X-Gm-Message-State: AOAM532NLrXQGGlqPxVRTpoQ1prkP/4fARm98zATSJbmGtqlgm93Zw5x x0YllWSUrAqHxCxOw6+NHCGRbu57BGo= X-Google-Smtp-Source: ABdhPJxzmcWC2QBjitjZhH1YFrCyrH2zSwzi7UPDOBA2Df6HJ7mL0Kx4k2zuws0NjDjkywHPia+DvQ== X-Received: by 2002:a7b:ce8c:: with SMTP id q12mr30922132wmj.91.1636122868632; Fri, 05 Nov 2021 07:34:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 2/6] tests/acceptance: Make pick_default_qemu_bin() more generic Date: Fri, 5 Nov 2021 15:34:12 +0100 Message-Id: <20211105143416.148332-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211105143416.148332-1-f4bug@amsat.org> References: <20211105143416.148332-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1636122871295100001 Make pick_default_qemu_bin() generic to find qemu-system or qemu-user binaries. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211102084232.2965062-3-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index a495e106d03..984c554e7d6 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -45,7 +45,7 @@ def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) =20 =20 -def pick_default_qemu_bin(arch=3DNone): +def pick_default_qemu_bin(bin_prefix=3D'qemu-system-', arch=3DNone): """ Picks the path of a QEMU binary, starting either in the current working directory or in the source tree root directory. @@ -64,7 +64,7 @@ def pick_default_qemu_bin(arch=3DNone): # qemu binary path does not match arch for powerpc, handle it if 'ppc64le' in arch: arch =3D 'ppc64' - qemu_bin_relative_path =3D "./qemu-system-%s" % arch + qemu_bin_relative_path =3D os.path.join(".", bin_prefix + arch) if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path =20 @@ -179,14 +179,14 @@ def _get_unique_tag_val(self, tag_name): return vals.pop() return None =20 - def setUp(self): + def setUp(self, bin_prefix): self.arch =3D self.params.get('arch', default=3Dself._get_unique_tag_val('ar= ch')) =20 self.cpu =3D self.params.get('cpu', default=3Dself._get_unique_tag_val('cpu= ')) =20 - default_qemu_bin =3D pick_default_qemu_bin(arch=3Dself.arch) + default_qemu_bin =3D pick_default_qemu_bin(bin_prefix, arch=3Dself= .arch) self.qemu_bin =3D self.params.get('qemu_bin', default=3Ddefault_qemu_bin) if self.qemu_bin is None: @@ -214,7 +214,7 @@ class Test(QemuBaseTest): def setUp(self): self._vms =3D {} =20 - super().setUp() + super().setUp('qemu-system-') =20 self.machine =3D self.params.get('machine', default=3Dself._get_unique_tag_val(= 'machine')) --=20 2.31.1