From ef95ba1ed8a196aea6e9754be21f542b0fafc53d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 26 Sep 2016 15:15:38 +0200 Subject: [PATCH] Fix sending smm option to qemu Fix #689 --- gns3server/modules/qemu/qemu_vm.py | 2 +- tests/modules/qemu/test_qemu_vm.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 2fd91e37..01188ab9 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -1428,7 +1428,7 @@ class QemuVM(BaseVM): # 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) diff --git a/tests/modules/qemu/test_qemu_vm.py b/tests/modules/qemu/test_qemu_vm.py index bd772cf0..60643a74 100644 --- a/tests/modules/qemu/test_qemu_vm.py +++ b/tests/modules/qemu/test_qemu_vm.py @@ -481,7 +481,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",