ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-13 04:48:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle
2016-09-21 19:27:44 +02:00
parent 056ae41d56 2bbdbeaa82
commit 4bd9556767
3 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1489,6 +1489,11 @@ class QemuVM(BaseNode):
command.extend(["-smp", "cpus={}".format(self._cpus)])
if self._run_with_kvm(self.qemu_path, self._options):
command.extend(["-enable-kvm"])
version = yield from self.manager.get_qemu_version(self.qemu_path)
# 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(["-boot", "order={}".format(self._boot_priority)])
cdrom_option = self._cdrom_option()
command.extend(cdrom_option)