Skip to content

Commit

Permalink
python/qemu: Move kvm_available() to its own module
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191216191438.93418-2-wainersm@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
  • Loading branch information
wainersm authored and clebergnu committed Dec 16, 2019
1 parent 2d320ad commit 8b272e0
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 20 deletions.
20 changes: 1 addition & 19 deletions python/qemu/__init__.py
Expand Up @@ -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
31 changes: 31 additions & 0 deletions 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 <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.
#

import os

# 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)
2 changes: 1 addition & 1 deletion tests/vm/basevm.py
Expand Up @@ -21,7 +21,7 @@
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
Expand Down

0 comments on commit 8b272e0

Please sign in to comment.