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 a60d865..4e1b706 100644 (file)
--- a/image_creator/util.py
+++ b/image_creator/util.py
@@ -41,6 +41,7 @@ import sh
 import hashlib
 import time
 import os
+import re
 
 
 class FatalError(Exception):
@@ -63,6 +64,26 @@ def get_command(command):
         return find_sbin_command(command, e)
 
 
+def get_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')).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'), tuple()
+
+    return binary, needed_args
+
+
 def try_fail_repeat(command, *args):
     """Execute a command multiple times until it succeeds"""
     times = (0.1, 0.5, 1, 2)
@@ -115,23 +136,4 @@ class MD5:
 
         return checksum
 
-    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
-
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :