arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-02-04 20:30:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2016-09-26 15:17:05 +02:00
commit f3596767c1
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/qemu/qemu_vm.py
View File

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

3
tests/compute/qemu/test_qemu_vm.py
View File

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