From 6974abcf414bfb833a58c41a60fb32f655a1cb0a Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 17 Mar 2014 01:55:19 +0100 Subject: [PATCH] hw: don't use assert in Kernel::pause_vm ref #1101 --- base-hw/src/core/kernel/thread.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/base-hw/src/core/kernel/thread.cc b/base-hw/src/core/kernel/thread.cc index 3211d2c34..2a71bc479 100644 --- a/base-hw/src/core/kernel/thread.cc +++ b/base-hw/src/core/kernel/thread.cc @@ -928,13 +928,17 @@ void Thread::_call_run_vm() void Thread::_call_pause_vm() { /* check permissions */ - assert(_core()); - - /* get targeted vm via its id */ + if (!_core()) { + PWRN("not entitled to pause virtual machine"); + return; + } + /* lookup virtual machine */ Vm * const vm = Vm::pool()->object(user_arg_1()); - assert(vm); - - /* pause targeted vm */ + if (!vm) { + PWRN("failed to lookup virtual machine"); + return; + } + /* pause virtual machine */ vm->pause(); }