Commit 8b272e00 authored by Wainer dos Santos Moschetta's avatar Wainer dos Santos Moschetta Committed by Cleber Rosa
Browse files

python/qemu: Move kvm_available() to its own module 



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: default avatarWainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191216191438.93418-2-wainersm@redhat.com>
Signed-off-by: default avatarCleber Rosa <crosa@redhat.com>
parent 2d320ad1

python/qemu/__init__.py

+1 −19
Original line number Diff line number Diff line
@@ -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

python/qemu/accel.py

0 → 100644
+31 −0
Original line number Diff line number Diff line 
"""

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)

tests/vm/basevm.py

+1 −1
Original line number Diff line number Diff line
@@ -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