From patchwork Mon Apr 18 09:26:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 714551 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3I9QjZR002461 for ; Mon, 18 Apr 2011 09:26:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754101Ab1DRJ0m (ORCPT ); Mon, 18 Apr 2011 05:26:42 -0400 Received: from goliath.siemens.de ([192.35.17.28]:32899 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754096Ab1DRJ0f (ORCPT ); Mon, 18 Apr 2011 05:26:35 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p3I9QOKG006276; Mon, 18 Apr 2011 11:26:25 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p3I9QO4m023094; Mon, 18 Apr 2011 11:26:24 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 3/4] qemu-kvm: Process async MCE events in main loop Date: Mon, 18 Apr 2011 11:26:22 +0200 Message-Id: <1cb9307f8636d282bcf9aa958438afb3510cd6a9.1303118779.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 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 09:26:45 +0000 (UTC) This aligns qemu-kvm with upstream commit ab443475c9. Namely, we were missing a call to an equivalent of kvm_arch_process_async_events from the main loop. This adds a stripped down version of upstream's process_async_events until we switch over. Signed-off-by: Jan Kiszka --- kvm.h | 2 -- qemu-kvm-x86.c | 27 +++++++++++++++++++++++++++ qemu-kvm.c | 9 ++++++--- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/kvm.h b/kvm.h index 90c4e48..bda6ad7 100644 --- a/kvm.h +++ b/kvm.h @@ -110,9 +110,7 @@ void kvm_arch_post_run(CPUState *env, struct kvm_run *run); int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run); -#ifdef OBSOLETE_KVM_IMPL int kvm_arch_process_async_events(CPUState *env); -#endif int kvm_arch_get_registers(CPUState *env); diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 20093fc..96d2fa6 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -811,3 +811,30 @@ void kvm_arch_process_irqchip_events(CPUState *env) do_cpu_sipi(env); } } + +int kvm_arch_process_async_events(CPUState *env) +{ + if (env->interrupt_request & CPU_INTERRUPT_MCE) { + /* We must not raise CPU_INTERRUPT_MCE if it's not supported. */ + assert(env->mcg_cap); + + env->interrupt_request &= ~CPU_INTERRUPT_MCE; + + kvm_cpu_synchronize_state(env); + + if (env->exception_injected == EXCP08_DBLE) { + /* this means triple fault */ + qemu_system_reset_request(); + env->exit_request = 1; + return 0; + } + env->exception_injected = EXCP12_MCHK; + env->has_error_code = 0; + + env->halted = 0; + if (kvm_irqchip_in_kernel() && env->mp_state == KVM_MP_STATE_HALTED) { + env->mp_state = KVM_MP_STATE_RUNNABLE; + } + } + return 0; +} diff --git a/qemu-kvm.c b/qemu-kvm.c index 8781cde..d7d50f5 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1414,9 +1414,12 @@ static int kvm_main_loop_cpu(CPUState *env) { while (1) { int run_cpu = !kvm_cpu_is_stopped(env); - if (run_cpu && !kvm_irqchip_in_kernel()) { - process_irqchip_events(env); - run_cpu = !env->halted; + if (run_cpu) { + kvm_arch_process_async_events(env); + if (!kvm_irqchip_in_kernel()) { + process_irqchip_events(env); + run_cpu = !env->halted; + } } if (run_cpu) { kvm_cpu_exec(env);