Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LkJpT-0007yj-4c for qemu-devel@nongnu.org; Thu, 19 Mar 2009 11:06:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LkJpO-0007vz-Di for qemu-devel@nongnu.org; Thu, 19 Mar 2009 11:06:42 -0400 Received: from [199.232.76.173] (port=51976 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LkJpO-0007vu-2P for qemu-devel@nongnu.org; Thu, 19 Mar 2009 11:06:38 -0400 Received: from mx2.redhat.com ([66.187.237.31]:36026) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LkJpN-0005xW-9t for qemu-devel@nongnu.org; Thu, 19 Mar 2009 11:06:37 -0400 Message-Id: <20090319150538.333090085@localhost.localdomain> References: <20090319145705.988576615@localhost.localdomain> Date: Thu, 19 Mar 2009 11:57:11 -0300 From: mtosatti@redhat.com Content-Disposition: inline; filename=handle-vmstop-vcpu Subject: [Qemu-devel] [patch 6/7] qemu: handle vmstop from cpu context Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gleb Natapov There are certain cases where cpu context requests a vm stop, such as -ENOSPC handling. IMO its simpler to handle vmstop only through the iothread. Note there is change in behaviour: now the cpu thread which requested vm_stop will actually only stop when it exits back to cpu_main_loop. It might cause further damage in between vmstop and cpu_main_loop. CC: Gleb Natapov Index: qemu/vl.c =================================================================== --- qemu.orig/vl.c +++ qemu/vl.c @@ -3472,7 +3472,22 @@ void vm_start(void) } } -void vm_stop(int reason) +static int vmstop_requested; + +static int qemu_vmstop_requested(void) +{ + int r = vmstop_requested; + vmstop_requested = 0; + return r; +} + +static void qemu_system_vmstop_request(int reason) +{ + vmstop_requested = reason; + main_loop_break(); +} + +static void __vm_stop(int reason) { if (vm_running) { cpu_disable_ticks(); @@ -3482,6 +3497,21 @@ void vm_stop(int reason) } } +void vm_stop(int reason) +{ + QemuThread me; + qemu_thread_self(&me); + + if (!qemu_thread_equal(&me, &io_thread)) { + qemu_system_vmstop_request(reason); + /* make sure we ourselves can't return to cpu_exec */ + if (cpu_single_env) + cpu_single_env->stop = 1; + return; + } + __vm_stop(reason); +} + /* reset/shutdown handler */ typedef struct QEMUResetEntry { @@ -3874,6 +3904,8 @@ static int vm_can_run(CPUState *env) return 0; if (reset_requested) return 0; + if (vmstop_requested) + return 0; return 1; } @@ -4054,6 +4086,8 @@ static void resume_all_vcpus(void) static void main_loop(void) { + int r; + qemu_mutex_init(&qemu_fair_mutex); qemu_mutex_init(&qemu_global_mutex); qemu_mutex_lock(&qemu_global_mutex); @@ -4073,12 +4107,14 @@ static void main_loop(void) no_shutdown = 0; else break; - } else if (qemu_powerdown_requested()) + } else if (qemu_powerdown_requested()) { qemu_system_powerdown(); - else if (qemu_reset_requested()) { + } else if (qemu_reset_requested()) { pause_all_vcpus(); qemu_system_reset(); resume_all_vcpus(); + } else if ((r = qemu_vmstop_requested())) { + vm_stop(r); } } } --