Merge branch 'master' into 2.0

gns3server/compute/qemu/qemu_vm.py

@@ -1493,7 +1493,7 @@ class QemuVM(BaseNode):
             # Issue on some combo Intel CPU + KVM + Qemu 2.4.0
             # https://github.com/GNS3/gns3-server/issues/685
             if version and parse_version(version) >= parse_version("2.4.0"):
-                command.extend(["-machine smm=off"])
+                command.extend(["-machine", "smm=off"])
         command.extend(["-boot", "order={}".format(self._boot_priority)])
         cdrom_option = self._cdrom_option()
         command.extend(cdrom_option)

tests/compute/qemu/test_qemu_vm.py

@@ -483,7 +483,8 @@ def test_build_command_kvm_2_4(linux_platform, vm, loop, fake_qemu_binary, port_
             "-smp",
             "cpus=1",
             "-enable-kvm",
-            "-machine smm=off",
+            "-machine",
+            "smm=off",
             "-boot",
             "order=c",
             "-serial",