Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-09-26 15:17:05 +02:00
commit f3596767c1
2 files changed
+3 -2

No files matched your search

+1 -1
View File
@@ -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)