From nobody Wed Nov 5 02:39:03 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 --- 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