arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 16:28:11 +00:00
Code Issues Releases Wiki Activity

Merge branch '1.4' into 1.5

Browse Source
This commit is contained in:
Julien Duponchelle 2016-01-04 09:21:14 +01:00
commit 884bfa4724
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server.bat
View File

@ -1,2 +1,2 @@
SET PYTHONPATH=.
python.exe gns3server/main.py --debug --local
SET PYTHONPATH=%~dp0
python.exe %~dp0/gns3server/main.py --debug --local

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

@ -310,7 +310,7 @@ class QemuVM(BaseVM):
:returns: QEMU hdb disk interface
"""
return self._hda_disk_interface
return self._hdb_disk_interface
@hdb_disk_interface.setter
def hdb_disk_interface(self, hdb_disk_interface):
@ -773,7 +773,10 @@ class QemuVM(BaseVM):
priority = win32process.IDLE_PRIORITY_CLASS
else:
priority = win32process.NORMAL_PRIORITY_CLASS
win32process.SetPriorityClass(handle, priority)
try:
win32process.SetPriorityClass(handle, priority)
except win32process.error as e:
log.error('Could not change process priority for QEMU VM "{}": {}'.format(self._name, e))
else:
if self._process_priority == "realtime":
priority = -20