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

Fix qemu close

Browse Source
This commit is contained in:
Julien Duponchelle 2015-02-20 17:31:02 +01:00
parent 15036837bb
commit 47be57dca7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/qemu/__init__.py
View File

@ -100,7 +100,7 @@ class Qemu(BaseManager):
return "" return ""
try: try:
output = yield from subprocess_check_output(qemu_path, "-version") output = yield from subprocess_check_output(qemu_path, "-version")
match = re.search("version\s+([0-9a-z\-\.]+)", output.decode("utf-8")) match = re.search("version\s+([0-9a-z\-\.]+)", output)
if match: if match:
version = match.group(1) version = match.group(1)
return version return version

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

@ -601,7 +601,7 @@ class QemuVM(BaseVM):
log.info("stopping QEMU VM instance {} PID={}".format(self._id, self._process.pid)) log.info("stopping QEMU VM instance {} PID={}".format(self._id, self._process.pid))
try: try:
self._process.terminate() self._process.terminate()
self._process.wait(1) self._process.wait()
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
self._process.kill() self._process.kill()
if self._process.poll() is None: if self._process.poll() is None: