From patchwork Fri May 20 17:12:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 804332 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4KHD62q019863 for ; Fri, 20 May 2011 17:13:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933696Ab1ETRMt (ORCPT ); Fri, 20 May 2011 13:12:49 -0400 Received: from goliath.siemens.de ([192.35.17.28]:19394 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757034Ab1ETRMq (ORCPT ); Fri, 20 May 2011 13:12:46 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p4KHCh8x012349; Fri, 20 May 2011 19:12:43 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4KHCeFB023636; Fri, 20 May 2011 19:12:43 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 07/10] qemu-kvm: Refactor exit_request processing in kvm_run Date: Fri, 20 May 2011 19:12:37 +0200 Message-Id: <0af3ba110bc49e48bddc9e56448b268dc6bcc008.1305911554.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 20 May 2011 17:13:07 +0000 (UTC) Move closer to upstream by reusing its self-signaling service in kvm_run, maintain cpu_single_env the same way, push this under qemu_mutex, and clear exit_request unconditionally when leaving kvm_run. Signed-off-by: Jan Kiszka --- qemu-kvm.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 843c973..24c667c 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -278,16 +278,21 @@ static inline void push_nmi(void) static void post_kvm_run(CPUState *env) { pthread_mutex_lock(&qemu_mutex); - kvm_arch_post_run(env, env->kvm_run); cpu_single_env = env; + + kvm_arch_post_run(env, env->kvm_run); } -static int pre_kvm_run(CPUState *env) +static void pre_kvm_run(CPUState *env) { kvm_arch_pre_run(env, env->kvm_run); + if (env->exit_request) { + qemu_cpu_kick_self(); + } + + cpu_single_env = NULL; pthread_mutex_unlock(&qemu_mutex); - return 0; } int kvm_is_ready_for_interrupt_injection(CPUState *env) @@ -300,6 +305,8 @@ static int kvm_run(CPUState *env) int r; struct kvm_run *run = env->kvm_run; + cpu_single_env = env; + again: if (env->kvm_vcpu_dirty) { kvm_arch_put_registers(env, KVM_PUT_RUNTIME_STATE); @@ -310,14 +317,8 @@ static int kvm_run(CPUState *env) run->request_interrupt_window = kvm_arch_try_push_interrupts(env); } - r = pre_kvm_run(env); - if (r) { - return r; - } - if (env->exit_request) { - env->exit_request = 0; - pthread_kill(env->thread->thread, SIG_IPI); - } + pre_kvm_run(env); + r = kvm_vcpu_ioctl(env, KVM_RUN, 0); post_kvm_run(env); @@ -325,6 +326,7 @@ static int kvm_run(CPUState *env) kvm_flush_coalesced_mmio_buffer(); if (r == -EINTR || r == -EAGAIN) { + env->exit_request = 0; return 1; } if (r < 0) { @@ -384,6 +386,7 @@ static int kvm_run(CPUState *env) if (!r) { goto again; } + env->exit_request = 0; return r; }