From patchwork Wed Dec 29 19:09:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 76937 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B41CBB6F10 for ; Thu, 30 Dec 2010 06:17:05 +1100 (EST) Received: from localhost ([127.0.0.1]:37241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PY1WA-0005NO-UB for incoming@patchwork.ozlabs.org; Wed, 29 Dec 2010 14:17:03 -0500 Received: from [140.186.70.92] (port=45330 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PY1PU-0001eL-8l for qemu-devel@nongnu.org; Wed, 29 Dec 2010 14:10:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PY1PR-0004eE-Vu for qemu-devel@nongnu.org; Wed, 29 Dec 2010 14:10:07 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:36478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PY1PR-0004dn-Kz for qemu-devel@nongnu.org; Wed, 29 Dec 2010 14:10:05 -0500 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate03.web.de (Postfix) with ESMTP id 1361E18385B9F; Wed, 29 Dec 2010 20:10:05 +0100 (CET) Received: from [178.3.144.157] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PY1PQ-0004GU-01; Wed, 29 Dec 2010 20:10:04 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Wed, 29 Dec 2010 20:09:55 +0100 Message-Id: <428467c033b61feae3136dea828988b95d070efc.1293649792.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18iNSkgFGf20V7e69c8gIpcRcGCbJicTSa4cPGY jpvUbQFOVxsKb4DYBmQ0r5b/s3DIstOZgmJahqTEymglKrpukq BSv/RsLEk= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 4/6] kvm: Stop on all fatal exit reasons X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Ensure that we stop the guest whenever we face a fatal or unknown exit reason. If we stop, we also have to enforce a cpu loop exit. Signed-off-by: Jan Kiszka --- kvm-all.c | 15 +++++++++++---- target-i386/kvm.c | 4 ++++ target-ppc/kvm.c | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 858c252..1e258d9 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -774,7 +774,7 @@ static int kvm_handle_io(uint16_t port, void *data, int direction, int size, } #ifdef KVM_CAP_INTERNAL_ERROR_DATA -static void kvm_handle_internal_error(CPUState *env, struct kvm_run *run) +static int kvm_handle_internal_error(CPUState *env, struct kvm_run *run) { if (kvm_check_extension(kvm_state, KVM_CAP_INTERNAL_ERROR_DATA)) { @@ -792,13 +792,13 @@ static void kvm_handle_internal_error(CPUState *env, struct kvm_run *run) if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) { fprintf(stderr, "emulation failure\n"); if (!kvm_arch_stop_on_emulation_error(env)) { - return; + return 0; } } /* FIXME: Should trigger a qmp message to let management know * something went wrong. */ - vm_stop(0); + return -1; } #endif @@ -926,16 +926,19 @@ void kvm_cpu_exec(CPUState *env) break; case KVM_EXIT_UNKNOWN: DPRINTF("kvm_exit_unknown\n"); + ret = -1; break; case KVM_EXIT_FAIL_ENTRY: DPRINTF("kvm_exit_fail_entry\n"); + ret = -1; break; case KVM_EXIT_EXCEPTION: DPRINTF("kvm_exit_exception\n"); + ret = -1; break; #ifdef KVM_CAP_INTERNAL_ERROR_DATA case KVM_EXIT_INTERNAL_ERROR: - kvm_handle_internal_error(env, run); + ret = kvm_handle_internal_error(env, run); break; #endif case KVM_EXIT_DEBUG: @@ -956,6 +959,10 @@ void kvm_cpu_exec(CPUState *env) } } while (ret > 0); + if (ret < 0) { + vm_stop(0); + env->exit_request = 1; + } if (env->exit_request) { env->exit_request = 0; env->exception_index = EXCP_INTERRUPT; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index b4c6cd4..ca4eb7a 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1534,6 +1534,10 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) DPRINTF("handle_hlt\n"); ret = kvm_handle_halt(env); break; + default: + fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); + ret = -1; + break; } return ret; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 5caa07c..849b404 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -307,6 +307,10 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) dprintf("handle halt\n"); ret = kvmppc_handle_halt(env); break; + default: + fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); + ret = -1; + break; } return ret;