From nobody Tue May 7 23:26:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573841448; cv=none; d=zoho.com; s=zohoarc; b=aq+9+fRAcAai5z/gqo6PluG2b7gNJe4L8cEpYNjKVz9PIxrRtjRLbw8V9ytNT5OBB6QsP9O5TUiBD9EWTQyzwvZxISp4SUeorqlrZHKRXpdkOd3ImoTHHZ6wcfTFPrfaiQycDmVlVpheWk2gfZzaR6KlKHVXOY4o1RnvJEPMs6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573841448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=dTwoBZzhvVrQ8sIB4Y50CVXpuaNkV8Buw3+5mqXw8u8=; b=Fq+K0gJ9ZnL1u/TvADvNuLH4FHIK56OAubnydirANtIrx/KpgUpdRrp2lc3AwQEqlJKZrlo/orkf9k+B8ZqtAWU9bI82B2CromROLfIXIrx0MI9bDVzrsdHoG+44j2xS3GspudK6X/O/DzQJu3q1CkXAXbci9mqHizfDxW/cua4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573841448979193.92081513301298; Fri, 15 Nov 2019 10:10:48 -0800 (PST) Received: from localhost ([::1]:44134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg3R-0002J1-Pa for importer@patchew.org; Fri, 15 Nov 2019 13:10:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg1S-0000aw-S8 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVg1R-00022T-E5 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44051 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVg1R-00021q-Ae for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-325-egsPnsN_OHGWF4Cdd58ISg-1; Fri, 15 Nov 2019 13:08:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DAAD1005500; Fri, 15 Nov 2019 18:08:37 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66EEC60557; Fri, 15 Nov 2019 18:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573841320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dTwoBZzhvVrQ8sIB4Y50CVXpuaNkV8Buw3+5mqXw8u8=; b=VF8WXZNY/VcCju9s7NJcwJfFPAvNvyttuumqWyqbf3LZh1M6eMWPuG1PT8XvaSVTN57XCQ F/y+FK63j0WHcoydA6o764NysDR4HZ3pSx8SFCYGqK1GdopWKt3UzrSG+7dS12zmi7Ounf r7d1vHRCAlJDUIMyrcrHivNC7VzNFZU= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH 1/4] python/qemu: Move kvm_available() to its own module Date: Fri, 15 Nov 2019 13:08:26 -0500 Message-Id: <20191115180829.10275-2-wainersm@redhat.com> In-Reply-To: <20191115180829.10275-1-wainersm@redhat.com> References: <20191115180829.10275-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: egsPnsN_OHGWF4Cdd58ISg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, ehabkost@redhat.com, philmd@redhat.com, jsnow@redhat.com, crosa@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This creates the 'accel' Python module to be the home for utilities that deal with accelerators. Also moved kvm_available() from __init__.py to this new module. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/__init__.py | 20 +------------------- python/qemu/accel.py | 36 ++++++++++++++++++++++++++++++++++++ tests/vm/basevm.py | 2 +- 3 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 python/qemu/accel.py diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index 6c919a3d56..eff17a306e 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -12,24 +12,6 @@ # Based on qmp.py. # =20 -import logging -import os - from . import qmp from . import machine - -LOG =3D logging.getLogger(__name__) - -# Mapping host architecture to any additional architectures it can -# support which often includes its 32 bit cousin. -ADDITIONAL_ARCHES =3D { - "x86_64" : "i386", - "aarch64" : "armhf" -} - -def kvm_available(target_arch=3DNone): - host_arch =3D os.uname()[4] - if target_arch and target_arch !=3D host_arch: - if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): - return False - return os.access("/dev/kvm", os.R_OK | os.W_OK) +from . import accel diff --git a/python/qemu/accel.py b/python/qemu/accel.py new file mode 100644 index 0000000000..1b825126c5 --- /dev/null +++ b/python/qemu/accel.py @@ -0,0 +1,36 @@ +""" +QEMU accel module: + +This module provides utilities for discover and check the availability of +accelerators. +""" +# Copyright (C) 2015-2016 Red Hat Inc. +# Copyright (C) 2012 IBM Corp. +# +# Authors: +# Fam Zheng +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. +# +# Based on qmp.py. +# + +import logging +import os + +LOG =3D logging.getLogger(__name__) + +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES =3D { + "x86_64" : "i386", + "aarch64" : "armhf" +} + +def kvm_available(target_arch=3DNone): + host_arch =3D os.uname()[4] + if target_arch and target_arch !=3D host_arch: + if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): + return False + return os.access("/dev/kvm", os.R_OK | os.W_OK) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 91a9226026..3e2b69c96c 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -21,7 +21,7 @@ import logging import time import datetime sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) -from qemu import kvm_available +from qemu.accel import kvm_available from qemu.machine import QEMUMachine import subprocess import hashlib --=20 2.18.1 From nobody Tue May 7 23:26:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573841453; cv=none; d=zoho.com; s=zohoarc; b=B2rbP+XCtCpicT+5mN/RUYkS2S7L+vf0mx1oPfuuUPposoUNgQDpzuiEHUe+/yaEwG/vW7/cxjQ7Qv29HdKnpwAOX1i7wX/r37SfIN1WKH4q2PLSWrUHoN3SEtRYnnbflY5z6kx2nY3wTCLtkPmVJE5WUMLlDS+LBKkn9SEC1uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573841453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=7pA9RmU+lwnOLpnZQo5JRakPX4GfcAqKlKbu17utjAM=; b=U6sQXxCdsIZwB1noix8klipoSkx/b9WcuCzhF1MWevk9o/uxVcP3gybOZrbiI+o/c3ojeS+S/P2K9YdQSsqR53bZyo/j6UuxQgrsVO6z8+nLbAkrn4779PGAIveaBXCY5L9BZKHT2UwZHg+lLXQHJ+P+7yaE7XbPnQJZw3wv/A4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573841453000572.3096430307057; Fri, 15 Nov 2019 10:10:53 -0800 (PST) Received: from localhost ([::1]:44136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg3U-0002Od-NS for importer@patchew.org; Fri, 15 Nov 2019 13:10:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45753) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg1S-0000au-Vr for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVg1R-00022a-Gp for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:42 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24148 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVg1R-00021w-DH for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-MCcKFsflN3msQCVGk58ivw-1; Fri, 15 Nov 2019 13:08:39 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56F8ADB20; Fri, 15 Nov 2019 18:08:38 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9018560557; Fri, 15 Nov 2019 18:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573841320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7pA9RmU+lwnOLpnZQo5JRakPX4GfcAqKlKbu17utjAM=; b=NmqQPUmKPAPhT0b5o1Y1ja9gnxPhgesv31Ip3jdq829Hnpn1ITMiyzob+HMIdkbKQ31aBI Ctf1epfOIi5KoK8vFonA+c4dn3R8u3kFegm9sF6wFwYwReynUZu80tB58Es5HRlc9bTNoI vH9nbPf2c5G/VfhT1nHdcLapqRCrqLg= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH 2/4] python/qemu: accel: Add list_accel() method Date: Fri, 15 Nov 2019 13:08:27 -0500 Message-Id: <20191115180829.10275-3-wainersm@redhat.com> In-Reply-To: <20191115180829.10275-1-wainersm@redhat.com> References: <20191115180829.10275-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: MCcKFsflN3msQCVGk58ivw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, ehabkost@redhat.com, philmd@redhat.com, jsnow@redhat.com, crosa@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since commit cbe6d6365a48 the command `qemu -accel help` returns the list of accelerators enabled in the QEMU binary. This adds the list_accel() method which return that same list. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/accel.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index 1b825126c5..a63ff980a9 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -18,6 +18,7 @@ accelerators. =20 import logging import os +import subprocess =20 LOG =3D logging.getLogger(__name__) =20 @@ -28,6 +29,25 @@ ADDITIONAL_ARCHES =3D { "aarch64" : "armhf" } =20 +def list_accel(qemu_bin): + """ + List accelerators enabled in the QEMU binary. + + @param qemu_bin (str): path to the QEMU binary. + @raise Exception: if failed to run `qemu -accel help` + @return a list of accelerator names. + """ + if not qemu_bin: + return [] + try: + out =3D subprocess.check_output("%s -accel help" % qemu_bin, shell= =3DTrue) + except: + LOG.debug("Failed to get the list of accelerators in %s" % qemu_bi= n) + raise + lines =3D out.decode().splitlines() + # Skip the first line which is the header. + return [l.strip() for l in lines[1:] if l] + def kvm_available(target_arch=3DNone): host_arch =3D os.uname()[4] if target_arch and target_arch !=3D host_arch: --=20 2.18.1 From nobody Tue May 7 23:26:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573841453; cv=none; d=zoho.com; s=zohoarc; b=Eenx0V/fAfQCVVVBvRNXFKpjhiWiY8t1Uu3ciXaBzTHTqcpsjvwm19kGZah1x3et9QPngV3y+t9HuwlCLjE/UjhHmJOVHVmaeXxJKgNay06uKMJOoV12ZVEn6K5lCJ/a/oz4hQFzmVZEATFEHIlayQCT8hP02kntyXXS+AEa/o0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573841453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Uzo0IBZEfDDnEOirdnitakwDJQ8L2Q9b7cQMpd1dxN0=; b=jCBHuR4qJGEhMBdiT2TIFQ7DkuQ6M86CTHlYX1549yMKE7GdFlJ1lK8zIdqQnIdCwkFEle9/whUz41s+RpmSACkTWiIKli8I8bMEw3cYoTy8bILtcgzGIGoyZxrDlIsbLsMCDVPCRDsw2MPAhWYizuXGuoGPyYr6IuTjKW6kKgo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573841453817585.4352438003676; Fri, 15 Nov 2019 10:10:53 -0800 (PST) Received: from localhost ([::1]:44138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg3Y-0002P5-KR for importer@patchew.org; Fri, 15 Nov 2019 13:10:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45793) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg1U-0000bL-W3 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVg1T-00023r-WA for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:44 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56349 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVg1T-00023X-SE for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:43 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-R_Pc_wSbO9K5c7dMhdXmSw-1; Fri, 15 Nov 2019 13:08:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45D88801FD2; Fri, 15 Nov 2019 18:08:39 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A1FE60557; Fri, 15 Nov 2019 18:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573841323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uzo0IBZEfDDnEOirdnitakwDJQ8L2Q9b7cQMpd1dxN0=; b=JZIoqmJYXIaUL7N7/cnfNPcrxUsb/nLl8zFOwI4nEo+xN0zVz+TG1dvhD6yC1Bhu8kguY3 lhaWNTLMrXYsPP4tAhwEX2asSK7LRqxV74LpjPU55Hig2+SqcPEsclVXAItaUs3QhBPrpm K49KceQPUU1sjGTXew9RkeND1/+bMdY= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH 3/4] python/qemu: accel: Strengthen kvm_available() checks Date: Fri, 15 Nov 2019 13:08:28 -0500 Message-Id: <20191115180829.10275-4-wainersm@redhat.com> In-Reply-To: <20191115180829.10275-1-wainersm@redhat.com> References: <20191115180829.10275-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: R_Pc_wSbO9K5c7dMhdXmSw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, ehabkost@redhat.com, philmd@redhat.com, jsnow@redhat.com, crosa@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently kvm_available() checks for the presence of kvm module and, if target and host arches don't mismatch. This patch adds an 3rd checking: if QEMU binary was compiled with kvm support. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/accel.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index a63ff980a9..1978fbee4e 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -48,9 +48,24 @@ def list_accel(qemu_bin): # Skip the first line which is the header. return [l.strip() for l in lines[1:] if l] =20 -def kvm_available(target_arch=3DNone): - host_arch =3D os.uname()[4] - if target_arch and target_arch !=3D host_arch: - if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): - return False - return os.access("/dev/kvm", os.R_OK | os.W_OK) +def kvm_available(target_arch=3DNone, qemu_bin=3DNone): + """ + Check if KVM is available using the following heuristic: + - Kernel module is present in the host; + - Target and host arches don't mismatch; + - KVM is enabled in the QEMU binary. + + @param target_arch (str): target architecture + @param qemu_bin (str): path to the QEMU binary + @return True if kvm is available, otherwise False. + """ + if not os.access("/dev/kvm", os.R_OK | os.W_OK): + return False + if target_arch: + host_arch =3D os.uname()[4] + if target_arch !=3D host_arch: + if target_arch !=3D ADDITIONAL_ARCHES.get(host_arch): + return False + if qemu_bin and "kvm" not in list_accel(qemu_bin): + return False + return True --=20 2.18.1 From nobody Tue May 7 23:26:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573841528; cv=none; d=zoho.com; s=zohoarc; b=DiHf+GepS7FXQeDjfoJ2m63iDZynel9MjGXbL1Fh424QLeFUyaklEBtB+LZe1GPEjQgmxKjUPRoTM+bsBf/71lPC6F26uDzwTZEODwp2QjsPYnkP0UGcUuk7d/osAdFQ5LuIYldJmoOrINfuHrhXj+RLCpMr2JMfYKdy6qA+N5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573841528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=tbxKVyX7c5DGLj0LBTUQMVlsCIRvYGzBP6qnF3v3a0s=; b=KxAXEy+CGWAJ60uCu3iUxJ4AvAqHLyyssBw7TwNycQorTwP2GyiNlvqWkbbrn0XwKJmqlct/iUjMDfz1VPhW3Oyhtoas1pM4B6Hb3f68icxtn5JgQGRmXUYE8O/qLPQc8FNXbMitiEiYbFiChnIjBmsT/pCwL3h6I1KcLgvPKx0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1573841528849724.2937667263146; Fri, 15 Nov 2019 10:12:08 -0800 (PST) Received: from localhost ([::1]:44146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg4i-0003lr-Bf for importer@patchew.org; Fri, 15 Nov 2019 13:12:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45814) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVg1X-0000hW-N0 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVg1W-00025d-Ly for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53161 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVg1W-00024Z-Hn for qemu-devel@nongnu.org; Fri, 15 Nov 2019 13:08:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-9UrTNzNHOBuHeDveEh2rEw-1; Fri, 15 Nov 2019 13:08:45 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FC2718B5F68; Fri, 15 Nov 2019 18:08:40 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 675EF60557; Fri, 15 Nov 2019 18:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573841326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tbxKVyX7c5DGLj0LBTUQMVlsCIRvYGzBP6qnF3v3a0s=; b=OJClVCXddUvuuTbOMaQprK9XgC5JMg1sMa92Kg+pAtX7r9ccM640nQ5UDWks4w8YYvmgTA bbHqGf/0BmeA8Q9TUXxI3wmtq9ULdSrHX/tMJXtIJdUUoJMfqVvA9f1HmmT48wGMMgXM2b Ylwpcvkasp+XkJL2BHM2/RsWHQHl6z0= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH 4/4] python/qemu: accel: Add tcg_available() method Date: Fri, 15 Nov 2019 13:08:29 -0500 Message-Id: <20191115180829.10275-5-wainersm@redhat.com> In-Reply-To: <20191115180829.10275-1-wainersm@redhat.com> References: <20191115180829.10275-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 9UrTNzNHOBuHeDveEh2rEw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, ehabkost@redhat.com, philmd@redhat.com, jsnow@redhat.com, crosa@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds a method to check if the tcg accelerator is enabled in the QEMU binary. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/accel.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index 1978fbee4e..513904d46d 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -69,3 +69,11 @@ def kvm_available(target_arch=3DNone, qemu_bin=3DNone): if qemu_bin and "kvm" not in list_accel(qemu_bin): return False return True + +def tcg_available(qemu_bin): + """ + Check if TCG is available. + + @param qemu_bin (str): path to the QEMU binary + """ + return 'tcg' in list_accel(qemu_bin) --=20 2.18.1