From: "Alex Bennée" <alex.bennee@linaro.org>
To: Wainer dos Santos Moschetta <wainersm@redhat.com>
Cc: fam@euphon.net, ehabkost@redhat.com, jsnow@redhat.com,
qemu-devel@nongnu.org, crosa@redhat.com, philmd@redhat.com
Subject: Re: [PATCH 1/4] python/qemu: Move kvm_available() to its own module
Date: Tue, 03 Dec 2019 16:21:47 +0000 [thread overview]
Message-ID: <87zhg99y78.fsf@linaro.org> (raw)
In-Reply-To: <20191115180829.10275-2-wainersm@redhat.com>
Wainer dos Santos Moschetta <wainersm@redhat.com> writes:
> 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 <wainersm@redhat.com>
> ---
> python/qemu/__init__.py | 20 +-------------------
> python/qemu/accel.py | 36 ++++++++++++++++++++++++++++++++++++
> tests/vm/basevm.py | 2 +-
> 3 files changed, 38 insertions(+), 20 deletions(-)
> create mode 100644 python/qemu/accel.py
>
> diff --git a/python/qemu/__init__.py b/python/qemu/__init__.py
> index 6c919a3d56..eff17a306e 100644
> --- a/python/qemu/__init__.py
> +++ b/python/qemu/__init__.py
> @@ -12,24 +12,6 @@
> # Based on qmp.py.
> #
>
> -import logging
> -import os
> -
> from . import qmp
> from . import machine
> -
> -LOG = logging.getLogger(__name__)
> -
> -# Mapping host architecture to any additional architectures it can
> -# support which often includes its 32 bit cousin.
> -ADDITIONAL_ARCHES = {
> - "x86_64" : "i386",
> - "aarch64" : "armhf"
> -}
> -
> -def kvm_available(target_arch=None):
> - host_arch = os.uname()[4]
> - if target_arch and target_arch != host_arch:
> - if target_arch != ADDITIONAL_ARCHES.get(host_arch):
> - return False
> - return os.access("/dev/kvm", os.R_OK | os.W_OK)
> +from . import accel
> diff --git a/python/qemu/accel.py b/python/qemu/accel.py
> new file mode 100644
> index 0000000000..1b825126c5
> --- /dev/null
> +++ b/python/qemu/accel.py
> @@ -0,0 +1,36 @@
> +"""
> +QEMU accel module:
> +
> +This module provides utilities for discover and check the availability of
> +accelerators.
> +"""
> +# Copyright (C) 2015-2016 Red Hat Inc.
> +# Copyright (C) 2012 IBM Corp.
> +#
> +# Authors:
> +# Fam Zheng <famz@redhat.com>
> +#
> +# 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.
Don't think you need this - it's very much not based on qmp.py (also
quite small).
> +#
> +
> +import logging
> +import os
> +
> +LOG = logging.getLogger(__name__)
I don't think we use logging at all so you can drop the import and LOG
lines.
Otherwise:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> +
> +# Mapping host architecture to any additional architectures it can
> +# support which often includes its 32 bit cousin.
> +ADDITIONAL_ARCHES = {
> + "x86_64" : "i386",
> + "aarch64" : "armhf"
> +}
> +
> +def kvm_available(target_arch=None):
> + host_arch = os.uname()[4]
> + if target_arch and target_arch != host_arch:
> + if target_arch != 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__), '..', '..', 'python'))
> -from qemu import kvm_available
> +from qemu.accel import kvm_available
> from qemu.machine import QEMUMachine
> import subprocess
> import hashlib
--
Alex Bennée
next prev parent reply other threads:[~2019-12-03 17:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 18:08 [PATCH 0/4] python/qemu: New accel module and improvements Wainer dos Santos Moschetta
2019-11-15 18:08 ` [PATCH 1/4] python/qemu: Move kvm_available() to its own module Wainer dos Santos Moschetta
2019-12-03 16:21 ` Alex Bennée [this message]
2019-11-15 18:08 ` [PATCH 2/4] python/qemu: accel: Add list_accel() method Wainer dos Santos Moschetta
2019-12-03 16:57 ` Alex Bennée
2019-11-15 18:08 ` [PATCH 3/4] python/qemu: accel: Strengthen kvm_available() checks Wainer dos Santos Moschetta
2019-12-03 16:58 ` Alex Bennée
2019-11-15 18:08 ` [PATCH 4/4] python/qemu: accel: Add tcg_available() method Wainer dos Santos Moschetta
2019-12-03 17:00 ` Alex Bennée
2019-12-03 17:25 ` [PATCH 0/4] python/qemu: New accel module and improvements Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zhg99y78.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).