Convert check_guestfs_version into an Image method

[snf-image-creator] / image_creator / util.py

diff --git a/image_creator/util.py b/image_creator/util.py
index fcf5dd5..4e1b706 100644 (file)
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -65,21 +65,23 @@ def get_command(command):
 
 
 def get_kvm_binary():
-    """Returns the path to the kvm binary"""
+    """Returns the path to the kvm binary and some extra arguments if needed"""
 
     uname = get_command('uname')
     which = get_command('which')
 
-    machine = str(uname('-m'))
+    machine = str(uname('-m')).strip()
     if re.match('i[3-6]86', machine):
         machine = 'i386'
 
     binary = which('qemu-system-%s' % machine)
 
+    needed_args = "--enable-kvm",
+
     if binary is None:
-        return which('kvm')
+        return which('kvm'), tuple()
 
-    return binary
+    return binary, needed_args
 
 
 def try_fail_repeat(command, *args):
@@ -106,26 +108,6 @@ def free_space(dirname):
     return stat.f_bavail * stat.f_frsize
 
 
-def check_guestfs_version(ghandler, major, minor, release):
-    """Checks if the version of the used libguestfs is smaller, equal or
-    greater than the one specified by the major, minor and release triplet
-
-    Returns:
-        < 0 if the installed version is smaller than the specified one
-        = 0 if they are equal
-        > 0 if the installed one is greater than the specified one
-    """
-
-    ver = ghandler.version()
-
-    for (a, b) in (ver['major'], major), (ver['minor'], minor), \
-            (ver['release'], release):
-        if a != b:
-            return a - b
-
-    return 0
-
-
 class MD5:
     """Represents MD5 computations"""
     def __init__(self, output):