arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Convert old -enable-kvm to kvm settings for Qemu

Browse Source 
Fix #233
This commit is contained in:
Julien Duponchelle 2015-06-12 09:40:38 +02:00
parent 6e88ba4c25
commit 04aac2f3dc
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/modules/qemu/qemu_vm.py
View File

@ -43,9 +43,6 @@ import logging
log = logging.getLogger(__name__)
class QemuVM(BaseVM):
module_name = 'qemu'
@ -346,7 +343,6 @@ class QemuVM(BaseVM):
id=self._id,
mac_addr=mac_address))
@property
def legacy_networking(self):
"""
@ -510,7 +506,11 @@ class QemuVM(BaseVM):
log.info('QEMU VM "{name}" [{id}] has set the QEMU options to {options}'.format(name=self._name,
id=self._id,
options=options))
self._options = options
if "-enable-kvm" in options:
self.kvm = True
options = options.replace("-enable-kvm", "")
self._options = options.strip()
@property
def initrd(self):

16
tests/modules/qemu/test_qemu_vm.py
View File

@ -173,7 +173,7 @@ def test_set_qemu_path(vm, tmpdir, fake_qemu_binary):
# Should not crash with unicode characters
path = str(tmpdir / "\u62FF" / "qemu-system-mips")
os.makedirs( str(tmpdir / "\u62FF") )
os.makedirs(str(tmpdir / "\u62FF"))
# Raise because file doesn't exists
with pytest.raises(QemuError):
@ -375,3 +375,17 @@ def test_hdd_disk_image(vm, tmpdir):
assert vm.hdd_disk_image == "/tmp/test"
vm.hdd_disk_image = "test"
assert vm.hdd_disk_image == str(tmpdir / "QEMU" / "test")
def test_options(vm):
vm.kvm = False
vm.options = "-usb"
assert vm.options == "-usb"
assert vm.kvm is False
def test_options_kvm(vm):
vm.kvm = False
vm.options = "-usb -enable-kvm"
assert vm.options == "-usb"
assert vm.kvm is True