From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391379256144.32598864760314; Fri, 12 Oct 2018 17:42:59 -0700 (PDT) Received: from localhost ([::1]:43189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB815-000350-8s for importer@patchew.org; Fri, 12 Oct 2018 20:42:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7z4-0001wK-Lc for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7z3-0000UJ-TG for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:46 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z3-0000U0-MX for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:45 -0400 Received: by mail-wm1-x344.google.com with SMTP id y140-v6so19022129wmd.0 for ; Fri, 12 Oct 2018 17:40:45 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TIWn4Hcoes5O1J8/W9dbFTgeT095AdVuEAiLnsz+5kc=; b=iXyLyUxtVL1xCHh2MDmwsPajxNymItP+p5Wx0pFLZSsQ1dyF0ip/oA2bnvhMNIhR1v lbdhvfNcsjrsCU3134T1BQO1N/0wzhLlaxNCfYzdNFEVwfKU7UxOaZGgD0zgjgnwFKTr cghuUNGF1ne57J4gCs+jTR5pPn7AER8ZG3h6RLMSU4vUhNU+eUIxf/Zn7ApZLT6xHM5P nhu2ncqsDfzekdAF+FYiQUBA5WCs6OYAuOQNIqeb3ricy1WNo4ickva4jtGAKSJDEFfO nXnXSxF3nmWlpXwxPlxK91+kcsC2Sri64GNSjrvxLGqzGOG8HcQ/wUdjrPz1QUQKyeNi uHJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TIWn4Hcoes5O1J8/W9dbFTgeT095AdVuEAiLnsz+5kc=; b=N4a7jS/5eyhXItWs9zDZkXD3eyMClTnfNhkL+cd7O7MTykAGVVohOH35dvg6H8j4Sr IdglT8qACXb5wIlZcd9usniUdrikrpgZF6tiWWPP++WRX6r+reZz2SkkwZ2MNfarcreb BjRzBaB9U9oeYnc6oSON5nsV/NttH/MQSHJhihIOQcFZwqfPUjHOegwOgTEpAfdqao+K C1wqywlbNYWKF5X0znpHATZTgBguaCH7b6hvYno9dkJbscbBXzdg0cpE6MEujQNoNhjk kSIcLrU44xQEFzGoPq1EDlmtTudwADaMxZkI8imKaNTw82OI9QMbiilvaHN+BCno5jOz 7GuQ== X-Gm-Message-State: ABuFfohabREhj0SPsyJ20CZnGeHgv1XprmwsdyZczmzzIBiCsDNgLZcT t72afVtbIQXLpyrbdm9e3Rk= X-Google-Smtp-Source: ACcGV61nJMEL2aH1G+zPcMWDunpg5vCmcnSlM1JfhJ4VXCTJVQSlZMtkVgrUDUm2VTDYKjIAQOPliw== X-Received: by 2002:a1c:7c07:: with SMTP id x7-v6mr5139141wmc.32.1539391244638; Fri, 12 Oct 2018 17:40:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:26 +0200 Message-Id: <20181013004034.6968-2-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v3 1/8] tests/vm: Extract the kvm_available() handy function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- scripts/qemu.py | 4 ++++ tests/vm/basevm.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index f099ce7278..9fc0be4828 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -26,6 +26,10 @@ import tempfile LOG =3D logging.getLogger(__name__) =20 =20 +def kvm_available(target_arch=3DNone): + return os.access("/dev/kvm", os.R_OK | os.W_OK) + + #: Maps machine types to the preferred console device types CONSOLE_DEV_TYPES =3D { r'^clipper$': 'isa-serial', diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index cafbc6b3a5..834bc90cc1 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -18,7 +18,7 @@ import logging import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scrip= ts")) -from qemu import QEMUMachine +from qemu import QEMUMachine, kvm_available import subprocess import hashlib import optparse @@ -72,7 +72,7 @@ class BaseVM(object): "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] if vcpus: self._args +=3D ["-smp", str(vcpus)] - if os.access("/dev/kvm", os.R_OK | os.W_OK): + if kvm_available(): self._args +=3D ["-enable-kvm"] else: logging.info("KVM not available, not using -enable-kvm") --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391379240482.67384172099946; Fri, 12 Oct 2018 17:42:59 -0700 (PDT) Received: from localhost ([::1]:43190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB817-00035r-Ue for importer@patchew.org; Fri, 12 Oct 2018 20:42:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7z6-0001wX-3f for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7z5-0000Ur-Bz for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:48 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z5-0000UU-4r for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:47 -0400 Received: by mail-wm1-x343.google.com with SMTP id z25-v6so19032611wmf.1 for ; Fri, 12 Oct 2018 17:40:47 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5BlNEZx1K/RhqchfBmdAY6M3dSenD8qjzK5bzwXM1RQ=; b=BF/UuRPrDrEh3mbjjU19IiJqN6DJqIGJnonZOLh1z80dAK6u9F19hzK/ZkLP195aof Q4KdJFSvhahHMTDQXannYUUz8pQtNbHXovgSv391rMu+2K/VVgOx/Sai8WbubW+SsI20 ZJ6g7i7B1YSyr8LDBYPBIqIN7gIcpE533AaYfw9yGmrS4aXWQ0+USHIu+Ma5RrmX74kG JBON93bPwdaEZv99+Dn6CMktp0Iw+Oe4VGdaBLEZP5XhS9EwfmTnGBZzRdyF1dzAcO28 4zu1L0+nGHYewEif4GN9SA36iwFNBR3OMY4yyOV92MnE0FBbvvsA715YuiGSr6lRxxQe RHeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5BlNEZx1K/RhqchfBmdAY6M3dSenD8qjzK5bzwXM1RQ=; b=Ql/vpERvfr2nRc332YjxGOhilXWq69lDOaN4cCmr5H9oZwxIH+xivncmSqnwHAoZvj qJyqKZPEJyWMkwzq9pRB9XpbLS7WNBlxSUZ7vxgUy+3fUyXBBTii8Xa3WhdT6RBbvIyI nEA9r4WmGekstG/cORx2uSxI+IIXj51IN38GpRSqcHNpY2wHZizFVsRs+q9MmgmCKZW1 jr2BHtrx+Fd9m086WiHadh4j2RMnAfAwv3jnL/o+iQiI1b68qeSCB4RPHBCzimdL4a6q XZGzIGfkMJfNgo2nF/pzdMG8Mwb5fTYmOoB2FUw41grHUosDNiKnEXJvltLOKu8HjyyO IXqQ== X-Gm-Message-State: ABuFfoi9TBqQzbMldSWskpAbUF1npfpXNoc9H1XQNXvtKa56wLurTddu WcQO/LOzWyNwcsIpIDiRRD8= X-Google-Smtp-Source: ACcGV62KhqHrRRfWhuGT3VZ/UvH/OzIC1IrHEY2JLGaTWghPC90Ut6rdIYC88WJmw6sRYXoHVdKgaw== X-Received: by 2002:a1c:d4b:: with SMTP id 72-v6mr7199609wmn.102.1539391246090; Fri, 12 Oct 2018 17:40:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:27 +0200 Message-Id: <20181013004034.6968-3-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v3 2/8] tests/vm: Do not abuse parallelism when KVM is not available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- v3: Use default args.jobs v2: Add get_default_jobs (Fam suggestion) --- tests/vm/basevm.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 834bc90cc1..2bd32dc6ce 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -196,6 +196,13 @@ class BaseVM(object): return self._guest.qmp(*args, **kwargs) =20 def parse_args(vm_name): + + def get_default_jobs(): + if kvm_available(): + return multiprocessing.cpu_count() / 2 + else: + return 1 + parser =3D optparse.OptionParser( description=3D"VM test utility. Exit codes: " "0 =3D success, " @@ -208,7 +215,7 @@ def parse_args(vm_name): help=3D"image file name") parser.add_option("--force", "-f", action=3D"store_true", help=3D"force build image even if image exists") - parser.add_option("--jobs", type=3Dint, default=3Dmultiprocessing.cpu_= count() / 2, + parser.add_option("--jobs", type=3Dint, default=3Dget_default_jobs(), help=3D"number of virtual CPUs") parser.add_option("--verbose", "-V", action=3D"store_true", help=3D"Pass V=3D1 to builds within the guest") --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391512493302.50695867974116; Fri, 12 Oct 2018 17:45:12 -0700 (PDT) Received: from localhost ([::1]:43200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB83L-00058d-HH for importer@patchew.org; Fri, 12 Oct 2018 20:45:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7z7-0001wm-Ec for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7z6-0000Vp-L3 for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:49 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z6-0000VF-Ee for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:48 -0400 Received: by mail-wm1-x342.google.com with SMTP id y140-v6so19022169wmd.0 for ; Fri, 12 Oct 2018 17:40:48 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d/GpWzB7xCBBvfcRD00L+3rLf75n70mtTp2uvQ1B1zs=; b=QiD3O5ZeHsZyj7Jdi3j4LTtmghcbyk7twZiuLRXqid0gtbxjo9q5+KThTmExW7x1wA RqeZeh+/7f8+s25dliJqt9xnyPZTyveZgmlUivMbljcfU56Nms60QcgzNaUgrm8d3xQl tJr7cJ3ieVIewC+WB4yR4QKxIoLc5qh9OPYklpk8dGl1ICTjXc0HidUvQnTy3rXrp9CE /QZZBk91VCOpdERlhrUDzJxh7T7jJ5FNIxWBzOTJ96BFiJiXMy/vmGpsqD4yGnoiUWj/ vkziA3ho5lHXumb/A5wfJBn8pLmocYPy9VN/4tmDE7N8ziONKBkR1Yux/0a8qV3cMzhf lUeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=d/GpWzB7xCBBvfcRD00L+3rLf75n70mtTp2uvQ1B1zs=; b=oto587g2HFmN8gAqJk2vJYeuWTGv0BD8R4TKpBypEsniRguHPRG7OXTBj+Vt590Cgf APYA1n8AfNWd/t10TvG9+S1tfwx0G/x7uyYOpnD9EWHrCvWX+TCQOA5neSwAe4k3SIqR hRkpEltEYXxlSlmpAlv2g0qZw0t0eppDpQ3bgC+lE0RFuNUJmYJJqFL6DoizLV5TObZK lUq6pkB6RIETbUAgR6iun5iKn5z56Fq4mGeuuyOJQlEzIpqEQx7Cq/EWYQOqs/uJ3Ny4 kkOpB8YHPC2VkIKzPqaS9/V7a0hFItzQ2p10i3ViFu8fKs1ypc+LBHTbBgytV1nFIuF6 bjzA== X-Gm-Message-State: ABuFfojzQH/t8HaRLXdo1dacxWZaXmJ373ND1z8M5ATnzXZyWuZtJF0p N4s+G2R/OJWt2VYYgSyThkk= X-Google-Smtp-Source: ACcGV63Dobsph15MN94qnDVFXT2rRpBm9bB86fNZVdkNU/oCYnlYkXYdZCk8eSXc05YPu5X8HKXjyQ== X-Received: by 2002:a1c:1a52:: with SMTP id a79-v6mr6600364wma.119.1539391247413; Fri, 12 Oct 2018 17:40:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:28 +0200 Message-Id: <20181013004034.6968-4-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v3 3/8] tests/vm: Do not use the -smp option with a single cpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 2bd32dc6ce..9415e7c33a 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -70,7 +70,7 @@ class BaseVM(object): "-device", "virtio-net-pci,netdev=3Dvnet", "-vnc", "127.0.0.1:0,to=3D20", "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] - if vcpus: + if vcpus and vcpus > 1: self._args +=3D ["-smp", str(vcpus)] if kvm_available(): self._args +=3D ["-enable-kvm"] --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391615764451.8653632000039; Fri, 12 Oct 2018 17:46:55 -0700 (PDT) Received: from localhost ([::1]:43209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB850-0006A1-Qy for importer@patchew.org; Fri, 12 Oct 2018 20:46:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7zA-0001zQ-Mv for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7z7-0000WH-OG for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:52 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z7-0000Vx-Hj for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:49 -0400 Received: by mail-wm1-x343.google.com with SMTP id y144-v6so14326265wmd.4 for ; Fri, 12 Oct 2018 17:40:49 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bQrFPDOsslNMRtlb05Nct4Dr8LgsmXvSAjSRE6t9/VM=; b=IaazvrBQql5EgD6LxuihMnuJpkaXzB/gfYJYNCfXznT7uLPnE/GyPqm9zYYcTM2W7G Q94XKtNknxgIJMkzn62RtMvdKNI8agct4xucglQMDmOF9mx+arAN+PzX1iMcsRGtyR8X wyAlB5pR7lvntGbo13OLkQx+b9BIEx4ITnhk1dnCJlWnP6NPufj2st6Z3TY3sEaaXQbu loBBDU4SEe5ns842GP2y5VW+t12rMqUST62tCuoWrXKSZpqCnhluQpsrqHTVrYmqpkWf avYJpGMFccMmZ4mH93Bua/Kflri3y08NMk1OnS7SrIh3VzM1lyNG3LkEUCdeoXBhkHy3 IPOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bQrFPDOsslNMRtlb05Nct4Dr8LgsmXvSAjSRE6t9/VM=; b=Le9OHeIDa99TuxtDsCPuP+ip2nDP036nVqaIXvpHm0l2LGa2brp6l14gwo5jFQQJSz Nf+GV5AgcTF/cl1X3QLQDIYgl8/RulUtAZhSrtACNNyS4k9KU5ZVl5CbzxdKwldaajew u/XPNA7JQNZk6lkHgh8wWWyeHryuwNE9pB+MVWlPfFjaqeQzr5RuZ/yrkxuCvAqZlK/g hpWkkzxIa3PYsjAun3DrRiPmFBmob/YrcJCUMNeC/ngeaMx9Ty4DWkpWZnmqCd+rVo/7 MzOTjIRDHNq1YaolJ+o4YHYDNiyr5UD0zIeYF61VPu80KuPozcEnRx1Z/3NVI6+fr8F8 hM5A== X-Gm-Message-State: ABuFfoho4X7QD6yiDsFE7OaY8o+q3KkdFswwThTT99U8kbvzAotXLiTE NmbXmjqdZTu4kBkT+hhWRFs= X-Google-Smtp-Source: ACcGV63KXOM7ejEkkPvwMKxv7E3FaZb0aHiaAd1/2ESYzphVNuq/98lumUTecZ2Hj3P0icsMfDKRYQ== X-Received: by 2002:a1c:d105:: with SMTP id i5-v6mr6388913wmg.69.1539391248653; Fri, 12 Oct 2018 17:40:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:29 +0200 Message-Id: <20181013004034.6968-5-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v3 4/8] tests/vm: Display remaining seconds to wait for a VM to start X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/basevm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 9415e7c33a..81a1cb05dd 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -177,11 +177,14 @@ class BaseVM(object): =20 def wait_ssh(self, seconds=3D300): starttime =3D datetime.datetime.now() + endtime =3D starttime + datetime.timedelta(seconds=3Dseconds) guest_up =3D False - while (datetime.datetime.now() - starttime).total_seconds() < seco= nds: + while datetime.datetime.now() < endtime: if self.ssh("exit 0") =3D=3D 0: guest_up =3D True break + seconds =3D (endtime - datetime.datetime.now()).total_seconds() + logging.debug("%ds before timeout", seconds) time.sleep(1) if not guest_up: raise Exception("Timeout while waiting for guest ssh") --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15393917134681016.7383431077369; Fri, 12 Oct 2018 17:48:33 -0700 (PDT) Received: from localhost ([::1]:43212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB86R-0006wZ-6U for importer@patchew.org; Fri, 12 Oct 2018 20:48:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7zA-0001zU-O6 for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7z8-0000X5-V7 for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:52 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z8-0000We-On for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:50 -0400 Received: by mail-wr1-x441.google.com with SMTP id e4-v6so15127945wrs.0 for ; Fri, 12 Oct 2018 17:40:50 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c6jWv9l/XqV+/M4KwyJhECJLwXVN+sEFIFriaWjLRI8=; b=nGOm6aEQ+GCE/w7fg1sbdHoBhaMMHY7PXNyCDg3gxe8J/Y3qiZVQdFRJ3PHnnWRSuz aqPmdFK1xcQAyWTC5aueeWl5mGXDt2MY7Ns9Y87Ux+WVq5WN75b+m8Nx9PrB/okKodN9 +T4DRIWXouMRleTg7Gb2kwQHcxB5dGO8o5UA7ckOBJnWK/1/yDSQRBzLdBhyt1hREHKY kKM3CIDpnkeS3lYz8Swff0Gk88pkjXFwrNI7L3d0oxS25zLLx3xBQFsaa3G98jcS2hHg GIuCawbhApQ3uOlp01rMPjvg1Cq9E81iEqD8iPC4Jb74FY2/JK82VpMJ3/yNGnhlN7RC 0YFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=c6jWv9l/XqV+/M4KwyJhECJLwXVN+sEFIFriaWjLRI8=; b=TLZQttMRvC/UlPMhkBrp6SI8v1QShfBTiMdEOuyM9YkvaQfeySFOGGi4EIPrbBj2ke S/4AmEq2SeDf3gpUDi5eFAOTcxCC9iGfUErIh48oeWqXgh0fVp4OS40JrCPfYXounhow sa7wEBrsKa49R2akYi3jA8+ZC0ZDm7MkM7R2WppF5q3gbI16XL5cgClcQkhNdI7/8BV5 UWEhUJMcg2bq5hGRhwBFIGgIWOWzgilpZ9imWYgyFWxKxAIIncOaR8w1wX2m12xWIS96 olTIYdf52UUfWnUw7Uf+GMsyPV4qhi48Gq/HvKr5THb/vT6gbiLb5jBGHg/KBLNx/Zzq tKMg== X-Gm-Message-State: ABuFfohRvWkV11llugMxAuyVpdrrXgv2YB1F8/uhSLqSsk6XbleHQ4Aq qX36voeL9UWzLYl3Yh3w3Lk= X-Google-Smtp-Source: ACcGV61Rtx+UiRoI+gcdTYxkjuh0z8rIPaYbBvU7Xx/qfi0XaEGxqDv0NDcEa90253ThyzE7d6+3OA== X-Received: by 2002:adf:e512:: with SMTP id j18-v6mr6831343wrm.111.1539391249796; Fri, 12 Oct 2018 17:40:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:30 +0200 Message-Id: <20181013004034.6968-6-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v3 5/8] tests/vm: Add a BaseVM::arch property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The 'arch' property gives a hint on which architecture the guest image runs. This can be use to select the correct QEMU binary path. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/basevm.py | 4 +++- tests/vm/centos | 1 + tests/vm/freebsd | 1 + tests/vm/netbsd | 1 + tests/vm/openbsd | 1 + tests/vm/ubuntu.i386 | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 81a1cb05dd..b2e0de2022 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -42,6 +42,8 @@ class BaseVM(object): BUILD_SCRIPT =3D "" # The guest name, to be overridden by subclasses name =3D "#base" + # The guest architecture, to be overridden by subclasses + arch =3D "#arch" def __init__(self, debug=3DFalse, vcpus=3DNone): self._guest =3D None self._tmpdir =3D os.path.realpath(tempfile.mkdtemp(prefix=3D"vm-te= st-", @@ -151,7 +153,7 @@ class BaseVM(object): "-device", "virtio-blk,drive=3Ddrive0,bootindex=3D0"] args +=3D self._data_args + extra_args logging.debug("QEMU args: %s", " ".join(args)) - qemu_bin =3D os.environ.get("QEMU", "qemu-system-x86_64") + qemu_bin =3D os.environ.get("QEMU", "qemu-system-" + self.arch) guest =3D QEMUMachine(binary=3Dqemu_bin, args=3Dargs) try: guest.launch() diff --git a/tests/vm/centos b/tests/vm/centos index afd560c564..daa2dbca03 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -19,6 +19,7 @@ import time =20 class CentosVM(basevm.BaseVM): name =3D "centos" + arch =3D "x86_64" BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); diff --git a/tests/vm/freebsd b/tests/vm/freebsd index b6983127d0..19a3729172 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -18,6 +18,7 @@ import basevm =20 class FreeBSDVM(basevm.BaseVM): name =3D "freebsd" + arch =3D "x86_64" BUILD_SCRIPT =3D """ set -e; rm -rf /var/tmp/qemu-test.* diff --git a/tests/vm/netbsd b/tests/vm/netbsd index a4e25820d5..fac6a7ce51 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -18,6 +18,7 @@ import basevm =20 class NetBSDVM(basevm.BaseVM): name =3D "netbsd" + arch =3D "x86_64" BUILD_SCRIPT =3D """ set -e; rm -rf /var/tmp/qemu-test.* diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 52500ee52b..cfe0572c59 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -18,6 +18,7 @@ import basevm =20 class OpenBSDVM(basevm.BaseVM): name =3D "openbsd" + arch =3D "x86_64" BUILD_SCRIPT =3D """ set -e; rm -rf /var/tmp/qemu-test.* diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 3f6ed48b74..1b7e1ab8f0 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -19,6 +19,7 @@ import time =20 class UbuntuX86VM(basevm.BaseVM): name =3D "ubuntu.i386" + arch =3D "i386" BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391382437753.3831446574383; Fri, 12 Oct 2018 17:43:02 -0700 (PDT) Received: from localhost ([::1]:43191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB81F-0003CD-6z for importer@patchew.org; Fri, 12 Oct 2018 20:43:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7zA-0001zY-Qo for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7zA-0000Xc-6E for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:52 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7z9-0000XH-VU for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:52 -0400 Received: by mail-wr1-x444.google.com with SMTP id 61-v6so15120151wrb.6 for ; Fri, 12 Oct 2018 17:40:51 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfSVS0GyuCAt7yH2tOeWcKDbbpzQB8vYcSdGexejRas=; b=qJK/AD/HMqP8XZPPDKuwVLuCTCeaojS27T/p1tau17CzqYqfPNqpQdAbzkfzaL32/w xym2ROKOssnBqKjhUAaJc41jW1HAebc0/Yz2mCothgB211x5eSkSAg/e3/s954ksXsG8 cNb35vWlfxPsNHBwv3EsxsCord0tgRqInC4XuqrXTY5JEJGlFkvZjYA4xGZiyInVGCZv WdrkaVVhU1kwF7Sz3LUkWRe+dEfBJWoWHler31aUeFmmlZh5HFVYfKyw/idMa5jSkC1c xkov4WSqGxWHZjcyBGtoD26JpLcCqkNw2ssv3aZqBkIs+1iVyCeXobjHcYA4kVZB3x6P uUuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SfSVS0GyuCAt7yH2tOeWcKDbbpzQB8vYcSdGexejRas=; b=E2P0KjIh6aUYGdNnUplFQGKDVsq3GW6NINQq1O/n0WyDvGxGH+43q8HmMSVgmk1Xke 3DdGava+ICm/YlpWEsf80t0LrjYBtxey8egX3AYSn6VcgV7vSq/4rZc4Xvt3V0x/+53O lPN6SK6PtcfUenDc1cn0fD3iYLdep03xnRs9TyML37uZiL31a8fAs9fULlnM8tWr08uu MyUQnSYB9emeZYmpmvmUhvOBwM1XtlU/PrEe0eTDso3DSbBmyyrT3sX0dEAptiKfGIjq reWIdTwA82KUsWTo9DMGax08fuwINtDDmXpB8rET/57N7GYdZe8kh9eQeVTiKARVWhRS RlAg== X-Gm-Message-State: ABuFfohAiHhn2YhlKDABT90SUFlCHuM9ZvNydMYMX81+dG8EUCoy0HyX 4tG4iFKp2O2M4Y53kIskcf8= X-Google-Smtp-Source: ACcGV63oj8neWGXQTA2GdMhn8/GQvaIIqW5JhsWztY2KReO/BwLPITDw0usWPvmtHjaRpPu/nxlk0A== X-Received: by 2002:adf:fd4a:: with SMTP id h10-v6mr7237651wrs.280.1539391250980; Fri, 12 Oct 2018 17:40:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:31 +0200 Message-Id: <20181013004034.6968-7-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v3 6/8] tests/vm: Let kvm_available() work in cross environments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- scripts/qemu.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/qemu.py b/scripts/qemu.py index 9fc0be4828..bcd24aad82 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -27,6 +27,8 @@ LOG =3D logging.getLogger(__name__) =20 =20 def kvm_available(target_arch=3DNone): + if target_arch and target_arch !=3D os.uname()[4]: + return False return os.access("/dev/kvm", os.R_OK | os.W_OK) =20 =20 --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539391782596472.3133167761847; Fri, 12 Oct 2018 17:49:42 -0700 (PDT) Received: from localhost ([::1]:43215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB87h-0007Yy-Kx for importer@patchew.org; Fri, 12 Oct 2018 20:49:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7zB-00020f-VQ for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7zB-0000YD-B7 for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:53 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7zB-0000Xg-4E for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:53 -0400 Received: by mail-wr1-x442.google.com with SMTP id n1-v6so15112172wrt.10 for ; Fri, 12 Oct 2018 17:40:53 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cLjTKzb3piZRNIMA4oXnjZamIw0zbdul31m3a2cFDDc=; b=fAmd+Pps/XRmp9b3ehgjVw9FrwWYBmBjFqFXTbsbPW4MF7u/yN++gq7uDwLe4oLfGM 18fFO9HwkRw58NzQ9GViJlrKVkqb3ipo0IgB4sRmKMJuHMe+ch3b7g9S+Sff8tBskOGZ rx/Zs8nxASt0xvoVp8WASc1QZcZoHn/BStlFzA8424omEH5YnEjUVGAdRvgEaYZrX4Wl Me2/TgR67/2EhcIWq00YWMZoo68aQ3I855IlVLzE/XG6fiyRvVYK1+DqNSgLNPFnr+8f SqgnxgnXDpaPaXkWV7JLj2gpjwTUSSBPCgOXcLoFK7f5xjLcODflW/1MadhU7m5nfYNx LSDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cLjTKzb3piZRNIMA4oXnjZamIw0zbdul31m3a2cFDDc=; b=V7RdVgYbEfZMU1JuJfLvilwCTl39CMIQa6UNFTY/s6VCWd1dV6K9ISm1fxjGXQ7+m0 qbEVZTYW+rFK9f9pIe+rgV/ZNsskRAD3QTaOOkUtXP0X5fLhKT/cX1h7w+cVAjs69wX8 /oQGqNUHduEgmWOqAey/WEuzPKQR/YGDFHEhLtIUMjpCcfzy3VcRZXauYFvdZlBTGAx1 HuALIiR7ewWTjcCdiv1PEIGDMkff51X7XGI39ZGlUKXg3v6b2o2VG7JfeUUHlIkUZZ9/ kchg6qeR3UPexNYo7dn1yFllMiDpf/0aEFNTBONEZOUBShZfX+q2tnFI1zhPPaL/aOBw /Prg== X-Gm-Message-State: ABuFfoj0bucPJ9TjKv2PJjw8Yjgg+4wQZBXrCcYKR9mK5z084wYaqZh3 afNpGIWzljcE4ZK5RTgDlgyoYP8w X-Google-Smtp-Source: ACcGV61N3T/YSWHkXlP4a4fRok+uVH/Fl1QChm6clrpZcYipDJAmII5lCJhdld6V+F4Ndh4S8tCLbA== X-Received: by 2002:adf:db8e:: with SMTP id u14-v6mr7225010wri.217.1539391252115; Fri, 12 Oct 2018 17:40:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:32 +0200 Message-Id: <20181013004034.6968-8-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v3 7/8] tests/vm: Do not use -enable-kvm if HOST != TARGET architecture X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index b2e0de2022..9f4794898a 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -74,7 +74,7 @@ class BaseVM(object): "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out"= )] if vcpus and vcpus > 1: self._args +=3D ["-smp", str(vcpus)] - if kvm_available(): + if kvm_available(self.arch): self._args +=3D ["-enable-kvm"] else: logging.info("KVM not available, not using -enable-kvm") --=20 2.19.1 From nobody Wed Nov 5 00:16:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153939151000955.27452258835922; Fri, 12 Oct 2018 17:45:10 -0700 (PDT) Received: from localhost ([::1]:43199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB83J-00057A-1H for importer@patchew.org; Fri, 12 Oct 2018 20:45:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gB7zD-00022H-9I for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gB7zC-0000Yo-JO for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:55 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gB7zC-0000YQ-Ci for qemu-devel@nongnu.org; Fri, 12 Oct 2018 20:40:54 -0400 Received: by mail-wm1-x343.google.com with SMTP id i8-v6so13695801wmg.0 for ; Fri, 12 Oct 2018 17:40:54 -0700 (PDT) Received: from x1.local (62.red-88-24-165.staticip.rima-tde.net. [88.24.165.62]) by smtp.gmail.com with ESMTPSA id 140-v6sm4046496wmx.34.2018.10.12.17.40.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ND0om7hNV/aP6Ht3Q+1N2ZlEd2ZYZwyPl0I4rkLXU5Q=; b=MGTSOoRn8mp9/qX5jkZyrZhJoG1jRDv+/8US3jVo4iX5ZqycGNcV1JbDWtrUqLtysb tY+kxC7atwlESJSAPBXyTQvXd2IpboX2+1589vJ0dnzDG4hwb+SF4JdeL84ubDvuhiuu 47VHmxG24f8LvS3BR/dO2uIoX/ZoC4v03xtkWd/sj2HbzwyaybJERtfvMgStLIzdHPsV Ho1m6+Nw0ELIb9/v4m/ckR1vNYY99yYaJb4Jz4fz50r9ul6o0Y7oYe+9nG7NAVd7Zgm4 P10jXN73qXetaRGlXAtb6DMpPKOv8L2aKGTRnkWm437sz+A41Y/7IC9csJpIamoyT2En 9GAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ND0om7hNV/aP6Ht3Q+1N2ZlEd2ZYZwyPl0I4rkLXU5Q=; b=KuM/S6Q/9w43HSPMaeboOWT+nVYbWwDDVQ2fAkThpxAejGr0PXwWwHHyC+7eSidLVS 5XtLcQndhnlsktAGhZNBfbCi/RYNBF8EyYytG0K/tHpa9n2GOHLSlX2nWdI720j7b4eH aqq55QNwdmtBzG1LpL857zMu0l/VtMoqx2A5lMWFkfLihVPR2qXleLzdnIKSzW3Cpcg/ L4hywTXXD7jKD9+Os5COExtv7xWVn/Lqx/VKWC4s22xNdDjQPzjO/SLZjCiXLLEISPqT 29W3HK+QLLeEiWEBRh5/Q0lobeFYXA4AWqC4Cc0vOdjdtQA03OvhVaOIdj8uuOhZYMha grdg== X-Gm-Message-State: ABuFfoiba93yLCN9M3v6TdxqjaOKeeeEcFwUtje8k8W7sRw+F0EjJHAK ZlIU/gLny1i57+bi49HgTCw= X-Google-Smtp-Source: ACcGV62LmhYv1GwjS9m9oG3Kye/cyDWz1mAPmpSCIyCR6F3ZQzy88PY0vbtIYs13HFP9ta0d6wAhCw== X-Received: by 2002:a1c:dac7:: with SMTP id r190-v6mr6890259wmg.137.1539391253403; Fri, 12 Oct 2018 17:40:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Sat, 13 Oct 2018 02:40:33 +0200 Message-Id: <20181013004034.6968-9-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013004034.6968-1-f4bug@amsat.org> References: <20181013004034.6968-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v3 8/8] tests/vm: Do not abuse parallelism when HOST != TARGET architecture X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/vm/basevm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 9f4794898a..5caf77d6b8 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -200,10 +200,10 @@ class BaseVM(object): def qmp(self, *args, **kwargs): return self._guest.qmp(*args, **kwargs) =20 -def parse_args(vm_name): +def parse_args(vmcls): =20 def get_default_jobs(): - if kvm_available(): + if kvm_available(vmcls.arch): return multiprocessing.cpu_count() / 2 else: return 1 @@ -216,7 +216,7 @@ def parse_args(vm_name): "3 =3D test command failed") parser.add_option("--debug", "-D", action=3D"store_true", help=3D"enable debug output") - parser.add_option("--image", "-i", default=3D"%s.img" % vm_name, + parser.add_option("--image", "-i", default=3D"%s.img" % vmcls.name, help=3D"image file name") parser.add_option("--force", "-f", action=3D"store_true", help=3D"force build image even if image exists") @@ -237,7 +237,7 @@ def parse_args(vm_name): =20 def main(vmcls): try: - args, argv =3D parse_args(vmcls.name) + args, argv =3D parse_args(vmcls) if not argv and not args.build_qemu and not args.build_image: print("Nothing to do?") return 1 --=20 2.19.1