Merge #561

561: Fix daemon hangs when suspending a suspended instance. r=townsend2010 a=smokfyz Fix #559 and also hangs when suspending a stopped instance. Co-authored-by: Ivan Sharapenkov <[email protected]>
canonical · Jan 16, 2019 · 4bd6a58 · 4bd6a58
2 parents f3ed010 + a9529e4
commit 4bd6a58
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/platform/backends/qemu/qemu_virtual_machine.cpp b/src/platform/backends/qemu/qemu_virtual_machine.cpp
@@ -319,9 +319,10 @@ void mp::QemuVirtualMachine::suspend()
             update_shutdown_status = false;
         }
     }
-    else if (state == State::off)
+    else if (state == State::off || state == State::suspended)
     {
-        mpl::log(mpl::Level::info, vm_name, fmt::format("Ignoring suspend issued while stopped"));
+        mpl::log(mpl::Level::info, vm_name, fmt::format("Ignoring suspend issued while stopped/suspended"));
+        monitor->on_suspend();
     }
 }