Merge branch '1.4' into 1.5

gns3server/modules/iou/iou_vm.py

@@ -676,7 +676,10 @@ class IOUVM(BaseVM):
             except asyncio.TimeoutError:
                 if self._iouyap_process.returncode is None:
                     log.warn("IOUYAP process {} is still running... killing it".format(self._iouyap_process.pid))
-                    self._iouyap_process.kill()
+                    try:
+                        self._iouyap_process.kill()
+                    except ProcessLookupError:
+                        pass
             self._iouyap_process = None
 
         self._started = False

gns3server/modules/qemu/__init__.py

@@ -21,6 +21,7 @@ Qemu server module.
 
 import asyncio
 import os
+import platform
 import sys
 import re
 import subprocess
@@ -38,6 +39,33 @@ class Qemu(BaseManager):
 
     _VM_CLASS = QemuVM
 
+    @staticmethod
+    @asyncio.coroutine
+    def get_kvm_archs():
+        """
+        Gets a list of architectures for which KVM is available on this server.
+
+        :returns: List of architectures for which KVM is available on this server.
+        """
+        kvm = []
+
+        try:
+            process = yield from asyncio.create_subprocess_exec("kvm-ok")
+            yield from process.wait()
+        except OSError:
+            return kvm
+
+        if process.returncode == 0:
+            arch = platform.machine()
+            if arch == "x86_64":
+                kvm.append("x86_64")
+                kvm.append("i386")
+            elif arch == "i386":
+                kvm.append("i386")
+            else:
+                kvm.append(platform.machine())
+        return kvm
+
     @staticmethod
     def paths_list():
         """
@@ -82,7 +110,7 @@ class Qemu(BaseManager):
         return paths
 
     @staticmethod
-    def binary_list():
+    def binary_list(archs=None):
         """
         Gets QEMU binaries list available on the host.
 
@@ -96,9 +124,17 @@ class Qemu(BaseManager):
                     if (f.startswith("qemu-system") or f.startswith("qemu-kvm") or f == "qemu" or f == "qemu.exe") and \
                             os.access(os.path.join(path, f), os.X_OK) and \
                             os.path.isfile(os.path.join(path, f)):
-                        qemu_path = os.path.join(path, f)
-                        version = yield from Qemu.get_qemu_version(qemu_path)
-                        qemus.append({"path": qemu_path, "version": version})
+                        if archs is not None:
+                            for arch in archs:
+                                if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)):
+                                    qemu_path = os.path.join(path, f)
+                                    version = yield from Qemu.get_qemu_version(qemu_path)
+                                    qemus.append({"path": qemu_path, "version": version})
+                        else:
+                            qemu_path = os.path.join(path, f)
+                            version = yield from Qemu.get_qemu_version(qemu_path)
+                            qemus.append({"path": qemu_path, "version": version})
+
             except OSError:
                 continue