From: Marcelo Tosatti Date: Wed, 3 Feb 2010 23:44:17 +0000 (-0200) Subject: Fix incoming migration with iothread X-Git-Tag: v0.12.4~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9167a242db92fa49ba1f60fcc748fa07258f3819;p=thirdparty%2Fqemu.git Fix incoming migration with iothread Do not allow the vcpus to execute if the vm is stopped. Fixes -incoming with CONFIG_IOTHREAD enabled. Signed-off-by: Marcelo Tosatti (cherry picked from commit c5f32c99c6855d466737daf1cd262e7e92062f87) --- diff --git a/vl.c b/vl.c index 6b6e86d69a3..77677e80187 100644 --- a/vl.c +++ b/vl.c @@ -3471,6 +3471,8 @@ static int cpu_can_run(CPUState *env) return 0; if (env->stopped) return 0; + if (!vm_running) + return 0; return 1; }