From 9235c3a91343a7b20e9cbef2d4eac0479881e0ea Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 3 Jul 2015 23:35:42 -0600 Subject: [PATCH] Adds -no-kvm to the ASA template and ignore -no-kvm on platforms other than Linux. Should resolve #472. --- gns3server/modules/qemu/qemu_vm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index 0f7dcce9..f0fe801f 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -483,6 +483,8 @@ class QemuVM(BaseVM): id=self._id, options=options)) + if not sys.platform.startswith("linux") and "-no-kvm" in options: + options = options.replace("-no-kvm") self._options = options.strip() @property @@ -1177,7 +1179,8 @@ class QemuVM(BaseVM): command = [self.qemu_path] command.extend(["-name", self._name]) command.extend(["-m", str(self._ram)]) - if sys.platform.startswith("linux") and self.manager.config.get_section_config("Qemu").getboolean("enable_kvm", True): + if sys.platform.startswith("linux") and self.manager.config.get_section_config("Qemu").getboolean("enable_kvm", True) \ + and "-no-kvm" not in self._options: if not os.path.exists("/dev/kvm"): raise QemuError("KVM acceleration cannot be used (/dev/kvm doesn't exist)") command.extend(["-enable-kvm"])