From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Consolidate kvm_eat_signals Date: Mon, 12 May 2008 12:50:04 +0200 Message-ID: <482820DC.6030509@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org Having both kvm_eat_signal and kvm_eat_signals makes the code harder to read. Moreover, given the single caller of kvm_eat_signals, there is no real reason to keep it in a separate function. Signed-off-by: Jan Kiszka --- qemu/qemu-kvm.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) Index: b/qemu/qemu-kvm.c =================================================================== --- a/qemu/qemu-kvm.c +++ b/qemu/qemu-kvm.c @@ -210,11 +210,12 @@ static int kvm_eat_signal(CPUState *env, return ret; } - -static void kvm_eat_signals(CPUState *env, int timeout) +static void kvm_main_loop_wait(CPUState *env, int timeout) { int r = 0; + pthread_mutex_unlock(&qemu_mutex); + while (kvm_eat_signal(env, 0)) r = 1; if (!r && timeout) { @@ -223,14 +224,10 @@ static void kvm_eat_signals(CPUState *en while (kvm_eat_signal(env, 0)) ; } -} -static void kvm_main_loop_wait(CPUState *env, int timeout) -{ - pthread_mutex_unlock(&qemu_mutex); - kvm_eat_signals(env, timeout); pthread_mutex_lock(&qemu_mutex); cpu_single_env = env; + vcpu_info[env->cpu_index].signalled = 0; } ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone