arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-24 06:51:19 +00:00
Code Issues Releases Wiki Activity

Prevent error when suspend/resume is not supported in QEMU VM.

Browse Source
This commit is contained in:
grossmj 2015-03-22 20:40:19 -06:00
parent a77023d1ee
commit f451ed144e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,6 +722,8 @@ class QemuVM(BaseVM):
b"restore-vm", b"running", b"save-vm", b"shutdown", b"suspended", b"restore-vm", b"running", b"save-vm", b"shutdown", b"suspended",
b"watchdog", b"guest-panicked" b"watchdog", b"guest-panicked"
]) ])
if result is None:
return result
return result.rsplit(' ', 1)[1] return result.rsplit(' ', 1)[1]
@asyncio.coroutine @asyncio.coroutine
@ -731,7 +733,9 @@ class QemuVM(BaseVM):
""" """
vm_status = yield from self._get_vm_status() vm_status = yield from self._get_vm_status()
if vm_status == "running": if vm_status is None:
raise QemuError("Suspending a QEMU VM is not supported")
elif vm_status == "running":
yield from self._control_vm("stop") yield from self._control_vm("stop")
log.debug("QEMU VM has been suspended") log.debug("QEMU VM has been suspended")
else: else:
@ -753,7 +757,9 @@ class QemuVM(BaseVM):
""" """
vm_status = yield from self._get_vm_status() vm_status = yield from self._get_vm_status()
if vm_status == "paused": if vm_status is None:
raise QemuError("Resuming a QEMU VM is not supported")
elif vm_status == "paused":
yield from self._control_vm("cont") yield from self._control_vm("cont")
log.debug("QEMU VM has been resumed") log.debug("QEMU VM has been resumed")
else: else: