From nobody Sat Feb 7 06:20:31 2026 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=1575668525; cv=none; d=zohomail.com; s=zohoarc; b=L5RbAiCy9QwdsIhZy9rVsApU1d9dzGFJJHc1hqcAEtK3VAf4Hv7z7HOC9q7G0fx5jsSG7unJtLKrZuIO/r9q6hv9MtwqaXB25mtoSa+k+dM/5/Tc5js6eSeENW1AlDNLEzuJEbEIQYedjhhSiJ8iS/WtdhmCavrsK0r+GBVhan8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575668525; 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=lL0qBFK2BngYsQQWD7SIkUQnSguGIQ0yqnTg8zBWbVavtRVDGrhmQbbAIpeW14nBxUP5pjay8M0e5Epr8yUoGiy8Kcyf9U+iBBadIJ0Oofwysg1rgSGCuW0huhjcf7O0Yd7JPwUvQI+mDj8DpUx01a9qQD3mxhdasC/Au3cVQsc= 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 15756685251705.766782807265031; Fri, 6 Dec 2019 13:42:05 -0800 (PST) Received: from localhost ([::1]:45638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLMR-0001CY-Up for importer@patchew.org; Fri, 06 Dec 2019 16:42:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45416) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLFX-0003ZM-Jq for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1idLFS-0001lS-PW for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:54 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33780 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 1idLFS-0001g4-Er for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:50 -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-115-xnxisL5qNPe6nHjHvAIGMg-1; Fri, 06 Dec 2019 16:34:41 -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 9EC9C8017DF; Fri, 6 Dec 2019 21:34: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 D4E0A5C1D6; Fri, 6 Dec 2019 21:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575668085; 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=BZpll1otqX/dx9NNcrfckcZeFpzBEfC9c04qo1coYxYslC0TQU8ZnHPWHBrtoA/gILLmc+ xlk0SwJQ+GH9yVhNx1gHsEnMKmwa4HdL5MIOBW4Gb84eWW+TRQPKo7toDvnEbDk4jcheyO KT4UppwzXCfz4CNYBk+0F6V/6Fx0UwI= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] python/qemu: Move kvm_available() to its own module Date: Fri, 6 Dec 2019 16:34:30 -0500 Message-Id: <20191206213433.11305-2-wainersm@redhat.com> In-Reply-To: <20191206213433.11305-1-wainersm@redhat.com> References: <20191206213433.11305-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: xnxisL5qNPe6nHjHvAIGMg-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, alex.bennee@linaro.org, philmd@redhat.com, crosa@redhat.com, jsnow@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 --- 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 Sat Feb 7 06:20:31 2026 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=1575668392; cv=none; d=zohomail.com; s=zohoarc; b=DajBa6b/CqpC+G6/cMQRUP7fL5N5mJ0OeAIecAyqFJVTa0nEMtjCILEkvATpDIAy41fYdE+5hb+JJiaHok4IhI7/3fVgajZ8FcrVZ+nh6Q6GHd17BNDbZpMs0KeoKcT7L6e3wjUCZ7jrgoRJneNBwVnCZl1T7OmYPNbmZ4kdVlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575668392; 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=0nU0GLDB1CzqLxIYN0MwWYmBawoC86YndCuM7qoWXvs=; b=HO4AmEFcnX3V1Yjs8M0G2zRSaVXCj7Hm5RBehjU3Oxm27tJU4moKuqpOLHb6GnFGAX/F/YMylLR8wMmLjDgdHosNXRHm+giuoTi/MyFrpNgaw12fh035LO9/rFJDht3IEEiXc7cGOo0bde3WKaPZFzwTym4gW4KJG1YDmiuulCk= 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 15756683920827.01091255995766; Fri, 6 Dec 2019 13:39:52 -0800 (PST) Received: from localhost ([::1]:45602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLKI-0006zZ-R9 for importer@patchew.org; Fri, 06 Dec 2019 16:39:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45266) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLFV-0003Z5-Tf for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1idLFS-0001k8-GE for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:51 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52015 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 1idLFS-0001f3-4E for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:50 -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-143-ZjuVcHCmNRObtM8mlpjVAA-1; Fri, 06 Dec 2019 16:34:43 -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 899981005502; Fri, 6 Dec 2019 21:34: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 C195D5C1D4; Fri, 6 Dec 2019 21:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575668084; 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=0nU0GLDB1CzqLxIYN0MwWYmBawoC86YndCuM7qoWXvs=; b=TEr8faMB8qFhd9OQwWzLG1vJPcisGgf9OxNwGPZvO55puMnJSM7VZKSrEeXwYbyS+x7StS WCpBTCCtxmk5YFi5QODlX61vEJkZh97FZGzzQR3bi9UNdv6BstPa5xpVKP4hj8Qxhp3ev4 3F+0tsO3FG+CmlRIYOltVpDTqQNmK2Q= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] python/qemu: accel: Add list_accel() method Date: Fri, 6 Dec 2019 16:34:31 -0500 Message-Id: <20191206213433.11305-3-wainersm@redhat.com> In-Reply-To: <20191206213433.11305-1-wainersm@redhat.com> References: <20191206213433.11305-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: ZjuVcHCmNRObtM8mlpjVAA-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, alex.bennee@linaro.org, philmd@redhat.com, crosa@redhat.com, jsnow@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: 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..746b7e68f5 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("%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.21.0 From nobody Sat Feb 7 06:20:31 2026 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=1575668285; cv=none; d=zohomail.com; s=zohoarc; b=VDsZKRNNmwKqq+qN3H/ElWSjk6u8qe8yGEDiBnH9/Lw5VyPQlW1E1VNGYf1J77gDOlCv/1fMTGvgbnGmeFGlPJ5d6FLyvJ39thGZvTF0yQO0N2yBKTOACMLuFQjin1BbGIsesxx2b9/kZJZzx5VERqzRp64UsKmWqBhkmDcGisM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575668285; 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=X8WKxdksJcs5sQyB7B17jkULkpMdrvKUXp5o7rxqiKs=; b=XNqfOYc7sw2CY9MrMCY4iVAoQkCUL0js+HsWgXLn9qSEhdBLKF3REe3WtnfGyy8eQXLIXGg7+NDozZ0xB4LqmTriYUZz1bhsgzuXQnE/G7W26dbqTjoLkswVUhvtpYB6uesojXerV+ByH9kGDjWpoX3/TCdHAnTgb5ew3qH/v1A= 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 1575668285661346.05509924676437; Fri, 6 Dec 2019 13:38:05 -0800 (PST) Received: from localhost ([::1]:45586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLIX-0005No-6W for importer@patchew.org; Fri, 06 Dec 2019 16:38:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45272) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLFV-0003Z8-Ta for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1idLFS-0001kT-GY for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:51 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42299 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 1idLFS-0001h7-5a for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:50 -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-297-KrLq6GQTMZSrczxi1pYGMw-1; Fri, 06 Dec 2019 16:34:43 -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 777A1800D5C; Fri, 6 Dec 2019 21:34: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 AD6E85C1D4; Fri, 6 Dec 2019 21:34:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575668087; 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=X8WKxdksJcs5sQyB7B17jkULkpMdrvKUXp5o7rxqiKs=; b=WSdynm1E/UMLUVBCr2TRSR6Z+ExUogswjhVqUzG2mLzf4qeI5ri4qCV7CtrdbbueE6HYuy QVmrRKWZTxHxlDRRl9VEnidJ12R0a7pt9kNoyYPioeeYVtkzdjOiK87mzXYUZPA7T22UUH RsNSR3+BMd2CM44OCw9g3d0d40Abe4k= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] python/qemu: accel: Strengthen kvm_available() checks Date: Fri, 6 Dec 2019 16:34:32 -0500 Message-Id: <20191206213433.11305-4-wainersm@redhat.com> In-Reply-To: <20191206213433.11305-1-wainersm@redhat.com> References: <20191206213433.11305-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: KrLq6GQTMZSrczxi1pYGMw-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, alex.bennee@linaro.org, philmd@redhat.com, crosa@redhat.com, jsnow@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: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cleber Rosa 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 746b7e68f5..9fecffb44b 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 [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.21.0 From nobody Sat Feb 7 06:20:31 2026 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=1575668299; cv=none; d=zohomail.com; s=zohoarc; b=GZ3w47rxqmCweZvItAOl8PlMq/76mBTMsk57KcGP3qkTWLTz4r/8k/+RJAmFznKgQh2U6YZn2MPvODo/N0YWe1BYHIdUMI8Rpfx0E3V562hjEwFp/H3e9DIo+Qfj2PAweR+wyFf55R2iiTtex3T70gMj0+LqhSCHihlcGJj2Jt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575668299; 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=ylAwq9HRT1FF4g6dhw//bDpZh9XCzHLItaBmGhOsz/4=; b=EfZwdS01v993m/+PHcLkQS00Whp0Tpw2D2kp60ZkFJyYuw4bDGTUUkbMCn9ObKfCWKAYvl4RSvSqfQU8Fsgj/+FADI5L5efy9JmYclVXioFIq2pZvAWjP/K9NoRSye/Y8qLbXM0fqTnQjpjGRMYat33hMam5SyrnVOzt5jYTZDs= 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 1575668299393110.93438488299375; Fri, 6 Dec 2019 13:38:19 -0800 (PST) Received: from localhost ([::1]:45590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLIn-0005U7-U1 for importer@patchew.org; Fri, 06 Dec 2019 16:38:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45283) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLFV-0003Z9-Vd for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1idLFS-0001kp-M4 for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:51 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31409 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 1idLFS-0001gl-Ci for qemu-devel@nongnu.org; Fri, 06 Dec 2019 16:34:50 -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-140-nFF31C_UNCecDaSkvrdywg-1; Fri, 06 Dec 2019 16:34:45 -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 6510CDBA3; Fri, 6 Dec 2019 21:34:43 +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 9A10D5C1D4; Fri, 6 Dec 2019 21:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575668086; 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=ylAwq9HRT1FF4g6dhw//bDpZh9XCzHLItaBmGhOsz/4=; b=VcBgcTACO1N7xdSEDuVh87254pN5aZfQkOLfxtS4GLXkJ2d3HOTHbnNJ8fPMlk7PDjZ3Um EOSoI7qP8OAByzbmqNljbJC03NkIDUINIeNk/1uOuq6ZVk98SVLEbzzoov9FDjBnKDZbvN KW9ceW3ygayVPNuDB/zi7JKH8HSAjv4= From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] python/qemu: accel: Add tcg_available() method Date: Fri, 6 Dec 2019 16:34:33 -0500 Message-Id: <20191206213433.11305-5-wainersm@redhat.com> In-Reply-To: <20191206213433.11305-1-wainersm@redhat.com> References: <20191206213433.11305-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: nFF31C_UNCecDaSkvrdywg-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, alex.bennee@linaro.org, philmd@redhat.com, crosa@redhat.com, jsnow@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: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Cleber Rosa 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 9fecffb44b..f4ff31825d 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