From nobody Wed May 8 23:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576159393; cv=none; d=zohomail.com; s=zohoarc; b=TAZKCiZPD52Jy4+YmhbSgW42V23ZlT34i4ymWhsvd96/xeaL+v0Er2g/JDeZW2BBrVaj3IvvLAqsqZb7rjXzhTZ0DhnPloVek/r9yRzZ6HfpuZCp46nz1GLHgBGn/GDoOUi0Bb/LfeJyJ6N3i+x02u9fldhiT/NmcFxXVtAr+x4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159393; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cG3VXDoE2RHDM36TR3e+aFQsCK+j0Jj2ZCUS7nwQld8=; b=DdTjFbFTkfAnF/dHgDSjlbAKz9T/yZco3g3WH8nXgaaIWt5uGo2ruEWD3KU4rMRdyvFypvUAi4247Z9gXI4o878YjsFjYggqeAzfIZmI2proh8V+HPMpSEPIM7Gz90Du+PoSG8tzTy8sBR0Sj9wO1n42CUkABKo+M/Hmfej8jlY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1576159393446477.7588936110218; Thu, 12 Dec 2019 06:03:13 -0800 (PST) Received: from localhost ([::1]:59810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP3f-0005AU-MS for importer@patchew.org; Thu, 12 Dec 2019 09:03:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45959) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO3I-0001aY-IM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifO3F-0005Fx-TJ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51125 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 1ifO3F-0005EW-OE for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58: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-291-hEOY86w4MS2HFSZUuOTEZw-1; Thu, 12 Dec 2019 07:58:39 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCF7A800D41; Thu, 12 Dec 2019 12:58: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 F2C4510013A1; Thu, 12 Dec 2019 12:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576155521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cG3VXDoE2RHDM36TR3e+aFQsCK+j0Jj2ZCUS7nwQld8=; b=MN4QLKn6GSR7u9+8yzfbha17a0Rl22T88laGU5t819yLbSYXdCWJuzwah82bwKwzaIIqdG g6/DRJ+SSmzOaYSSU6bHe1dSVj4dsM/BsnfDZNaU34+SPDw+ajyuzT0vLNf62ScWDx9IqJ dL3VeZBmh7Sur7doya+fA4BEx373VBs= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] python/qemu: Move kvm_available() to its own module Date: Thu, 12 Dec 2019 07:58:27 -0500 Message-Id: <20191212125831.2654-2-wainersm@redhat.com> In-Reply-To: <20191212125831.2654-1-wainersm@redhat.com> References: <20191212125831.2654-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: hEOY86w4MS2HFSZUuOTEZw-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, jsnow@redhat.com, alex.bennee@linaro.org, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa --- python/qemu/__init__.py | 20 +------------------- python/qemu/accel.py | 31 +++++++++++++++++++++++++++++++ tests/vm/basevm.py | 2 +- 3 files changed, 33 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..cbeac10dd1 --- /dev/null +++ b/python/qemu/accel.py @@ -0,0 +1,31 @@ +""" +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. +# + +import os + +# 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.21.0 From nobody Wed May 8 23:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576159763; cv=none; d=zohomail.com; s=zohoarc; b=dvDF8yt7m7msMUtDaamvZ+MM7kiehZzog8BZG4CUSS0j28DsZOladDeZRO+XIhFrM6HojaEpCayBanPMv2geaq/CUD7VOujoyR/9q+PRA06UP82oIJXvQSWnwe0CmcJ6KgeFcVB3bf5rp2DlsBedvhM5mCE0tgLVUTxosPVEQgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159763; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4BVR2ZIDZFU03OkFVALH6qlfykzii53qv0O0o9o0n5A=; b=ZW1nCsdZ6+qbITcseq27jkWwjrJSKCvn0b4d3HIfpdHLRMfu9W5BIJqwqp3K3gQCUmYhvUMin8sdslXiAsXCvIHf1uUX+VTDEJxlp/zIqhwUOQ/ou9RxHb9AEJnPNVTpdMHD6N1F5K9XyBmHmPDbndtpUyZnnm5aY11MTDG3KKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1576159763756520.9700684005426; Thu, 12 Dec 2019 06:09:23 -0800 (PST) Received: from localhost ([::1]:59967 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP9e-0004zM-2o for importer@patchew.org; Thu, 12 Dec 2019 09:09:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO3I-0001by-I6 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifO3G-0005Hj-TL for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:43 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:26845 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 1ifO3G-0005GE-Ob for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:42 -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-270-rRRcxDnZPHyZfEhLY5EhWg-1; Thu, 12 Dec 2019 07:58:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9AC3107ACC9; Thu, 12 Dec 2019 12:58: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 DFAFB10013A1; Thu, 12 Dec 2019 12:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576155521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4BVR2ZIDZFU03OkFVALH6qlfykzii53qv0O0o9o0n5A=; b=e2uaD7j0ju/p4qN9lf9hScABq8lWUtuOTqAwVTJ3Vg4qNogX1zc7GcmOagBa43fIFO6vsn 4/BB/tL2AarFWALQGpBveGnFydsDXlu90QcNUUolRFM6+HIo7OsM7d0B0JzUWqSSFWuBt/ ZhQcwgTHVWqVn1fys8RxdDahrbj0Yug= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] python/qemu: accel: Add list_accel() method Date: Thu, 12 Dec 2019 07:58:28 -0500 Message-Id: <20191212125831.2654-3-wainersm@redhat.com> In-Reply-To: <20191212125831.2654-1-wainersm@redhat.com> References: <20191212125831.2654-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: rRRcxDnZPHyZfEhLY5EhWg-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, jsnow@redhat.com, alex.bennee@linaro.org, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/accel.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index cbeac10dd1..ddcdbfd9ae 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -14,7 +14,11 @@ accelerators. # the COPYING file in the top-level directory. # =20 +import logging import os +import subprocess + +LOG =3D logging.getLogger(__name__) =20 # Mapping host architecture to any additional architectures it can # support which often includes its 32 bit cousin. @@ -23,6 +27,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([qemu_bin, '-accel', 'help'], + universal_newlines=3DTrue) + except: + LOG.debug("Failed to get the list of accelerators in %s" % qemu_bi= n) + raise + # Skip the first line which is the header. + return [acc.strip() for acc in out.splitlines()[1:]] + def kvm_available(target_arch=3DNone): host_arch =3D os.uname()[4] if target_arch and target_arch !=3D host_arch: --=20 2.21.0 From nobody Wed May 8 23:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576159187; cv=none; d=zohomail.com; s=zohoarc; b=gEkgcC+3O2svp4uVwmRDNlk/lXTYuHbVSBVYdpGNpsZ+J3d/+UkesyxiLjsGPjE0zuXXGuvAkzERXO+sZFbaxVYzD6ShuWFcQe+fxHsg88M3iA3+6y53tOzuEm+aRE7Dq94+rwNEcLXCEfWlhcilRoXoyy4R17VB+PrhlaqoZKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159187; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DO2JTHXVvoBxHvVNh/C4MODzYKUrxIjfOCU+b9vGhhs=; b=QQDNkwLKJZadKf2E6U0XXf3poPiRFy3q6boB7JvDWSIPMuUex7XB2e+4QTSi0axP8XbyVdifVG4MYCxu85BVZ2TFt4ANgXBk7Pl1ElJTiVE62sGwXwJQr4ZUWIee09Jg4XUAwne5yMAdjW2QxeqrO98/LV9NL0WDrzhiY7CELns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1576159187648955.6600761879248; Thu, 12 Dec 2019 05:59:47 -0800 (PST) Received: from localhost ([::1]:59754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP0M-0001Af-Ch for importer@patchew.org; Thu, 12 Dec 2019 08:59:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO3I-0001cd-IK for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifO3H-0005Ia-8R for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:44 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23480 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 1ifO3H-0005Hb-4Z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58: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-103-jz_V3uRuPW24a0Ganrb9KQ-1; Thu, 12 Dec 2019 07:58:41 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9845A91222; Thu, 12 Dec 2019 12:58: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 CBAF810013A1; Thu, 12 Dec 2019 12:58:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576155522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DO2JTHXVvoBxHvVNh/C4MODzYKUrxIjfOCU+b9vGhhs=; b=I8hnPzGvsWEq36qri96fQclh3+Dd5CvCfHDR11cod+aHrngxbCIWjDZIynBBJPSyMsqx1k 2kMvdbtYVbnmCufe8He1nwBxHmVoNdp4IBnGb4b/MV76r47Ewb2PxE1lclTFzkFX+xxK9L cUIgNqiJctlNz9QqlY23+oA5nsW/Nyc= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] python/qemu: accel: Strengthen kvm_available() checks Date: Thu, 12 Dec 2019 07:58:29 -0500 Message-Id: <20191212125831.2654-4-wainersm@redhat.com> In-Reply-To: <20191212125831.2654-1-wainersm@redhat.com> References: <20191212125831.2654-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: jz_V3uRuPW24a0Ganrb9KQ-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, jsnow@redhat.com, alex.bennee@linaro.org, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Cleber Rosa --- 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 ddcdbfd9ae..833f9431ce 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -46,9 +46,24 @@ def list_accel(qemu_bin): # Skip the first line which is the header. return [acc.strip() for acc in out.splitlines()[1:]] =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.21.0 From nobody Wed May 8 23:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576159340; cv=none; d=zohomail.com; s=zohoarc; b=PpCjn/e4Ri1n79/IiKvfnuNYcKEljt6cK/2jGzL6+G726AiqDB95pisk1rkfh4moRvC2dMbddmkTWpGfSIBDfkQeefGWlUeWf72kDnqQPzUzFEAUflDmuHi67FttsyIXXoMRyw7ySQrizyXSA9Ogb6uMxaSJYqYHJ6nsFxk1/V4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2llVOPrvcn3hE8GA6L5vIGd9hGWg3jgKIe+gOU4In1M=; b=LOmeIwGooAGEuQI2bMqiN32/DGCMtvakke4NJLlnh1eJ30cCDelK8/Aou/n8hVC4lrOb6sRrkdxrYLjW1pGtQhhIZ6aN07ik1SdbY8AFzPdkSZ5fncbRuC9x2AsWziLDdIKIyEy8bLovYzbYIWd/3SUUDJfzRsiwuv0QsVVuHzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1576159340948144.7601687968846; Thu, 12 Dec 2019 06:02:20 -0800 (PST) Received: from localhost ([::1]:59800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP2p-0003tC-D1 for importer@patchew.org; Thu, 12 Dec 2019 09:02:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46809) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO3N-0001i7-DD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifO3K-0005Nx-L1 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:49 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41785 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 1ifO3K-0005Ml-G5 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58: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-144-jBS7BZ2JPhKjjG68bexh0g-1; Thu, 12 Dec 2019 07:58:42 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8748718B9FC9; Thu, 12 Dec 2019 12:58:41 +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 BA49810013A1; Thu, 12 Dec 2019 12:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576155525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2llVOPrvcn3hE8GA6L5vIGd9hGWg3jgKIe+gOU4In1M=; b=E64n/rdeXZLPs6xjRqryJYut7PuZmK8+9D3Xm+fv1f86uNOS8670Mh53WV3rOtEGNOr5BF LUDCAWXCyWp4RiBf9+V4BdifjhesYZTlzieg90th2NhMMEJgeksb2Rve2/4/H1rYxzErb0 DSzIDjQCO/Uh9y0BHx5xQ5DiZyUGo2s= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] python/qemu: accel: Add tcg_available() method Date: Thu, 12 Dec 2019 07:58:30 -0500 Message-Id: <20191212125831.2654-5-wainersm@redhat.com> In-Reply-To: <20191212125831.2654-1-wainersm@redhat.com> References: <20191212125831.2654-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: jBS7BZ2JPhKjjG68bexh0g-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, jsnow@redhat.com, alex.bennee@linaro.org, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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: Cleber Rosa Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Cleber Rosa --- python/qemu/accel.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index 833f9431ce..2823bb0cc3 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -67,3 +67,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.21.0 From nobody Wed May 8 23:29:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1576159465; cv=none; d=zohomail.com; s=zohoarc; b=jlx/0F9jYKZXcRQHEX4P+xVyuEjjwju20jVbU+3KifqBvT9RPfFzHh3nbWITrmcploUHlad6Kfy5D8Bclp8uvnFz6LANAdwdqx+FcbPMD4PW9a4uht7X+Jy21JaYX6cp5BggsQ7RIcLJYFGZXFW3EZB4z6Di39iAMT73kENx8jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576159465; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yRvhJd1J7DuZ9DIj5XWMPvxBgRSr8B6bbR062Zm6ESk=; b=GNE8sMYazY2j+AlGupsl1MINhEOmPLjFljc3FLofo2kBaCAGPMXhfX7EkWsfMgUn9DqFurqg6ivYt6E/Bguwe9uJW+/dpUDE0K1PSWzo62BefI9zyJJp9FdfrJ+vsFbXBKO6oTXOa4xiuJ71BpdfIs0RTeJEMVzpyyVVgIEfRzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1576159465772750.2595799752955; Thu, 12 Dec 2019 06:04:25 -0800 (PST) Received: from localhost ([::1]:59828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifP4q-0006lG-5Q for importer@patchew.org; Thu, 12 Dec 2019 09:04:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47431) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO3S-0001lW-Mz for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifO3Q-0005U5-88 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:54 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:35565 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 1ifO3P-0005RY-IS for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:58:51 -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-93-kARTAf4PORaDRvvDetLw6w-1; Thu, 12 Dec 2019 07:58:43 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76593107B26F; Thu, 12 Dec 2019 12:58:42 +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 AA05D1001B09; Thu, 12 Dec 2019 12:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576155530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yRvhJd1J7DuZ9DIj5XWMPvxBgRSr8B6bbR062Zm6ESk=; b=ZtBRO8zD1DGz6e8oegDh83CNQE71EH/h2io/3ZfV04OMJhu8dAIvF8lGP1OoiepiWHD+cn ZgENBtLMV542z1gz6XH2z1rj/POR25zoOHwJlTsE2XFFKNJ/oewsbYwwGvhSUidvD08Cij MI3JKej7+bMpmJ773da2NYdez1RqEPY= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] python/qemu: Remove unneeded imports in __init__ Date: Thu, 12 Dec 2019 07:58:31 -0500 Message-Id: <20191212125831.2654-6-wainersm@redhat.com> In-Reply-To: <20191212125831.2654-1-wainersm@redhat.com> References: <20191212125831.2654-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: kARTAf4PORaDRvvDetLw6w-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.81 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, jsnow@redhat.com, alex.bennee@linaro.org, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" __init_.py import some sub-modules unnecessarily. So let's clean it up. Signed-off-by: Wainer dos Santos Moschetta Suggested-by: Cleber Rosa --- python/qemu/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py index eff17a306e..4ca06c34a4 100644 --- a/python/qemu/__init__.py +++ b/python/qemu/__init__.py @@ -9,9 +9,3 @@ # 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. -# - -from . import qmp -from . import machine -from . import accel --=20 2.21.0