From e5e96ee8b48a736ecf78131586196e41516945f7 Mon Sep 17 00:00:00 2001 From: Vasil Rangelov Date: Thu, 24 Dec 2015 16:45:02 +0200 Subject: [PATCH 1/3] Made the gns3server.bat successfully start the server independent of the CWD at the time of running. It's now relative to the location of the .bat file itself. --- gns3server.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server.bat b/gns3server.bat index ff132074..b5448a41 100644 --- a/gns3server.bat +++ b/gns3server.bat @@ -1,2 +1,2 @@ -SET PYTHONPATH=. -python.exe gns3server/main.py --debug --local +SET PYTHONPATH=%~dp0 +python.exe %~dp0/gns3server/main.py --debug --local From a4d9f95c9bb95ae01be03b08e0c15f3d692d1cfb Mon Sep 17 00:00:00 2001 From: Vasil Rangelov Date: Fri, 1 Jan 2016 02:44:23 +0200 Subject: [PATCH 2/3] Fixed showing of Qemu hdb_disk_interface - it showed hda_disk_interface instead, which resulted in an odd visual glitch in the GUI. --- gns3server/modules/qemu/qemu_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/modules/qemu/qemu_vm.py b/gns3server/modules/qemu/qemu_vm.py index e0355ded..36736e4e 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -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): From 137cf59e9738d978797d28282f1e1dcdbcbe828c Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Sun, 3 Jan 2016 21:23:35 +0100 Subject: [PATCH 3/3] Catch exception if we can't change process priority on Windows Fix #380 --- 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 36736e4e..077d7469 100644 --- a/gns3server/modules/qemu/qemu_vm.py +++ b/gns3server/modules/qemu/qemu_vm.py @@ -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