From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1918AC43603 for ; Fri, 6 Dec 2019 21:41:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA9E92173E for ; Fri, 6 Dec 2019 21:41:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BZpll1ot" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA9E92173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1idLML-0001CY-Md for qemu-devel@archiver.kernel.org; Fri, 06 Dec 2019 16:41:57 -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 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= 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) 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-Type: text/plain; charset=UTF-8 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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