From nobody Sat May 18 05:53:17 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=1576523803; cv=none; d=zohomail.com; s=zohoarc; b=gZ5Mk6AFOz3pcdRZbdV/xAecKD6jzypwSK/pphlCyBffBeTiG1m1CXaU6IredvVxwsxG1ETBkxv+jyB9e22jysIndFsnUSto18py8jUMPJ0md0LY/MobQW3TYQ/aTSzAbXCbbZ+jpwUnQHe+C8Am/ToWAhm1OnG+XFWAnOP8vn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576523803; 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=hsCdOuGnulLbNTwSRb4VhYo7PUsSxJfUWvByrmhxF/c=; b=MtzhjLk5DSgku9Gayg0/ATJtL5DrDgJWEt5MFLE/KUr9KXcAjZ43dDRmYIZIG4L9DegVnb7tL42Pve1kek5fdas5teSD+39OGzDWsNAZLz7KxYurxG26q1iZzoOqfVnI1ohvpLzii7DnuW9u1QwbAkjnS0P2U3lpY21ALnrOeHo= 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 15765238037359.352934760045741; Mon, 16 Dec 2019 11:16:43 -0800 (PST) Received: from localhost ([::1]:58958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvrF-0007fq-Va for importer@patchew.org; Mon, 16 Dec 2019 14:16:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35726) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvpX-0006Mn-BK for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igvpV-0007z9-6z for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:54 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20665 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 1igvpV-0007yi-3Z for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:53 -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-18-zoxRWNoYNPmsbMchRLCOrg-1; Mon, 16 Dec 2019 14:14:49 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E804A107ACC4; Mon, 16 Dec 2019 19:14:48 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09C9A5C1B5; Mon, 16 Dec 2019 19:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576523691; 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=hsCdOuGnulLbNTwSRb4VhYo7PUsSxJfUWvByrmhxF/c=; b=Jj+TMDUm3rvRjpRyhFfAZhESYBXNqd0R/+/8EB3jwDdUxKD3k/RNcWl5+Opl+GbM9Up2eb Nmz7A2/LiMpZURFvK4fx0EqOYw3aC0R1jqOcnxlmiUh7NgptPigpwfh+wTKHObH2qQZ/QU mc1yEVVmtObB8uO3tksjRYUCGuK4C5c= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] python/qemu: Move kvm_available() to its own module Date: Mon, 16 Dec 2019 16:14:34 -0300 Message-Id: <20191216191438.93418-2-wainersm@redhat.com> In-Reply-To: <20191216191438.93418-1-wainersm@redhat.com> References: <20191216191438.93418-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: zoxRWNoYNPmsbMchRLCOrg-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.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) 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 | 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.23.0 From nobody Sat May 18 05:53:17 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=1576523921; cv=none; d=zohomail.com; s=zohoarc; b=Y8KCz+li3zNTL/EqftnfhpWrTmF++Fj1vasdwYFcVuDmRnS6UtBV0RrW+gJfMzfnabhvBiqAO4CGAeXpVKZdyII1U8QZor1Jlcmls1cxDzBVKE4SdZucy+47dFIyytn/0mVh/sHNTWbX0xBKbSDc0HTz177z7TqATsgKwNKTNv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576523921; 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=AcD9ROGvtSV+wqMEqqKIqhvjn5QGmno0NIrziv6959U=; b=e/HbDM9npyMZqKXb+ufevM4edQBjT1iUdBZSZWYceO6Srq6CkR73tRe4kQnQTHWB+KU9KJbAXXtRB5xtUJH0tLbHw9gC/Imt2RNPjZN6favLIGvuT/A3en9Ag3EePIVdwMg6MUHDEPcz6aWywwDlKdqx8Ho5GsW3ncxMLucFRF8= 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 157652392102078.64956355175218; Mon, 16 Dec 2019 11:18:41 -0800 (PST) Received: from localhost ([::1]:58976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvt9-0001Xs-P4 for importer@patchew.org; Mon, 16 Dec 2019 14:18:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35734) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvpX-0006Mp-BU for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igvpW-0007zW-0w for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:54 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34512 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 1igvpV-0007zH-Tq for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:14:53 -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-352--QYynzvoNhSR8l1J7Yb8Kg-1; Mon, 16 Dec 2019 14:14:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3AD6310054E3; Mon, 16 Dec 2019 19:14:51 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 555915C1B5; Mon, 16 Dec 2019 19:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576523693; 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=AcD9ROGvtSV+wqMEqqKIqhvjn5QGmno0NIrziv6959U=; b=LFRt5T271WJgA3o6+P3jBjQeyEip/nAHOjx2l5sPsz/zo9IOELDqOslEcTEwb96j6DkTPO XI+AjplplHr3+q+5szsviB40Edap/XifnJQIsIURiFCyXNWcG9LEvSYvZni29wtgrp9L9T yLPdrelKK3KPv7gT+CxNLR0DQ07+9qQ= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v4 2/5] python/qemu: accel: Add list_accel() method Date: Mon, 16 Dec 2019 16:14:35 -0300 Message-Id: <20191216191438.93418-3-wainersm@redhat.com> In-Reply-To: <20191216191438.93418-1-wainersm@redhat.com> References: <20191216191438.93418-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: -QYynzvoNhSR8l1J7Yb8Kg-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.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) 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: Cleber Rosa Tested-by: Cleber Rosa --- python/qemu/accel.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index cbeac10dd1..7395cee793 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_bin) + 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.23.0 From nobody Sat May 18 05:53:17 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=1576523813; cv=none; d=zohomail.com; s=zohoarc; b=VvxbVyJLLifhMfOHDHomisdODTtoMQ+tj9+ZCmK0FUe5lEG8oIBTlgXm5IZFiwDBktk5Ejzbgj0u+NcnYSQUsr8oi2ReV3v0G5OiecuTsrnbYXi5gJivfvbS6JaoA8fxb2ZKiNMJ+pxOYH4rlyblwdH7YEa3X5mROir4OByHuFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576523813; 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=zbpEPorC+KdqjIx+JGbo9QFpBupxOt7Szs2Uciq2jOI=; b=WHTqxZ1M7owwmV/WudIyM1CCk4GAqRVPjNcI+cBfiHwOD4df92LnUNuWZyw8nhXrUAbJioYPqluPE3akS+q3I+GqZdx8j9k0+njfkikXgjMp89J2GXiJVPd3FIsA1+1DHSOFfTnp1noKLNwoDZpuNXG8Oc/6I4nAbRkcw+INmQY= 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 157652381322963.39594514408918; Mon, 16 Dec 2019 11:16:53 -0800 (PST) Received: from localhost ([::1]:58960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvrP-0007s1-S9 for importer@patchew.org; Mon, 16 Dec 2019 14:16:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35774) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvpd-0006St-7p for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igvpc-00085X-6S for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:01 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55944 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 1igvpc-00085N-3I for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:00 -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-193-lkpVKUL8PSWs7X4gC3W7wQ-1; Mon, 16 Dec 2019 14:14:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 806F3800D41; Mon, 16 Dec 2019 19:14:53 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A43D5C1B5; Mon, 16 Dec 2019 19:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576523699; 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=zbpEPorC+KdqjIx+JGbo9QFpBupxOt7Szs2Uciq2jOI=; b=OsDeqaKt3DqKNZmVTx+aLNH8eonOPqlkrZklSQUZ3fWsjQiXqgiW8sC2hq8nGexRitYyhN X7lIRgQKxuCtlYq+GdRGjUEQ9h7vzBRgiSuTJBd5B2XerXXIaGs8bXc3ixTu2YvsAbxM8I PP8sfdboAqSCnCI5koK/CkXWZAaMZgE= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v4 3/5] python/qemu: accel: Strengthen kvm_available() checks Date: Mon, 16 Dec 2019 16:14:36 -0300 Message-Id: <20191216191438.93418-4-wainersm@redhat.com> In-Reply-To: <20191216191438.93418-1-wainersm@redhat.com> References: <20191216191438.93418-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: lkpVKUL8PSWs7X4gC3W7wQ-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) 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 7395cee793..5fce3aa3dd 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.23.0 From nobody Sat May 18 05:53:17 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=1576523978; cv=none; d=zohomail.com; s=zohoarc; b=Tw1AYfSgxpXvlRpC7kEOIW5xGnP+iWAidGPyu5bkSWTKc5QCg+WkCtoZg5fpihebC0Z3M9pDm2noFEa4jadOJJbeov0nwZvkw9vd+Z5O5ZVdj6sb9GmMBCy2vjyinBezvi3uy7eJCjMO+kzu2iXywQzEjVTuYG4hu74ksYKgCFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576523978; 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=wpxDs6n6O4frSEEXe94efQ5PjWCAgHDZH3DfoyfB/D4=; b=IAp9i0qtZsNSWID+X4iySjf6fUu5fvX1sbYDARZyC0vhvPYNQRXmy9FCnk8std/HTXbTvmrqxzMgzmCvQGP9+Hyam4BzF80q1oaIDIWTkSc7XnPOUYrQunuaOWCHFPcvMHMmkeueR+6dubyHqqt90z8Zvna482ek0+rdAZX9hAc= 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 1576523978856582.854103852507; Mon, 16 Dec 2019 11:19:38 -0800 (PST) Received: from localhost ([::1]:58986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvu5-0002mt-EB for importer@patchew.org; Mon, 16 Dec 2019 14:19:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35783) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvpd-0006U7-SZ for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igvpc-000867-PQ for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:01 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41659 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 1igvpc-00085j-M3 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:00 -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-28--xXCWYZmOguIcgGL6v61SQ-1; Mon, 16 Dec 2019 14:14:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D06521800D7B; Mon, 16 Dec 2019 19:14:55 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4F265C1B5; Mon, 16 Dec 2019 19:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576523700; 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=wpxDs6n6O4frSEEXe94efQ5PjWCAgHDZH3DfoyfB/D4=; b=SDQ7e7a8lRciqfTboS/YwnaU1iOYAfNklwjtC08Y4Eidw1R7HpDqj+j1wsdJ+osXsrVmdw zgeGms+NEc46K9D5h2NMHulUpomd72lu687cX+ExlQgaCxNZjraS+j8fzVyiUIqnEgKIP3 AT7zXSclBX/XMAsO3sq4XZf+c6GUESM= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v4 4/5] python/qemu: accel: Add tcg_available() method Date: Mon, 16 Dec 2019 16:14:37 -0300 Message-Id: <20191216191438.93418-5-wainersm@redhat.com> In-Reply-To: <20191216191438.93418-1-wainersm@redhat.com> References: <20191216191438.93418-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: -xXCWYZmOguIcgGL6v61SQ-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) 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 5fce3aa3dd..0b38ddf0ab 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.23.0 From nobody Sat May 18 05:53:17 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=1576524041; cv=none; d=zohomail.com; s=zohoarc; b=Sa5ujJKemhRs8eQDUOaRonpHALxHFsRIhBzPhdY+qZTpigmk7UesXh0+tDaFF170hXwpWV5QzODrWSuGi3PxE2UZjY4A4QC77LgwuvrjLhK99deOexRkYvbSqVC9JziR0fyEhxHUZqOursh9tgPgjx5NouqIqBNTVu4HESrkgB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576524041; 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=opxgMBEqE0axlltMOU81qh5BAxTCcpRMIpFZ8BVm1aQ=; b=eS1l51pnQSdPqkwhlYGY/Xucdx/c//NG+0Uq1E4QghugikkiqaZXUx6AojEaAuJqOFhhMVTcCAnTi16DzhczJwSW8bX4iI+G9GkwXxigiN6eh+9X+XyfVRCeTnPJbY/WwlDI4qjYSt6ivR4ZI16Sg8yjARFE7XU3XOVrToZ3syY= 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 1576524041759252.32039835493686; Mon, 16 Dec 2019 11:20:41 -0800 (PST) Received: from localhost ([::1]:58994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvv6-0003pB-Nr for importer@patchew.org; Mon, 16 Dec 2019 14:20:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35795) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igvpe-0006Ut-K5 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igvpd-00087A-Hs for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:02 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:52421 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 1igvpd-00086F-Ea for qemu-devel@nongnu.org; Mon, 16 Dec 2019 14:15:01 -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-53-kCGTr6PMOWuXOyKUOE3pSw-1; Mon, 16 Dec 2019 14:14:59 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 21FC5800D41; Mon, 16 Dec 2019 19:14:58 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C6675C1B5; Mon, 16 Dec 2019 19:14:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576523700; 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=opxgMBEqE0axlltMOU81qh5BAxTCcpRMIpFZ8BVm1aQ=; b=GFNrO+CPMhx/EhmeKsROGVxuCi2yW9vSGPX1yFHnqalMEaP6KtSYzTNhRSKWWuqIg4K+tN tzPHtjT13fo/J8cEU9R2NBZcRmoH6rAzdIn+I6PmKVvsgmoPpEnuzgcP7I+fevh3YqyGP4 Cg0AskwpQqZGXXgzcwZ9dwfWFQrmiQc= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v4 5/5] python/qemu: Remove unneeded imports in __init__ Date: Mon, 16 Dec 2019 16:14:38 -0300 Message-Id: <20191216191438.93418-6-wainersm@redhat.com> In-Reply-To: <20191216191438.93418-1-wainersm@redhat.com> References: <20191216191438.93418-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: kCGTr6PMOWuXOyKUOE3pSw-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, 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) 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 Reviewed-by: Cleber Rosa Tested-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.23.0