From: Avi Kivity Subject: [PATCH QEMU-KVM 1/4] Move internal error handling into a function Date: Wed, 4 Nov 2009 12:49:53 +0200 Message-ID: <1257331796-29722-2-git-send-email-avi@redhat.com> References: <1257331796-29722-1-git-send-email-avi@redhat.com> Cc: Gleb Natapov , kvm@vger.kernel.org To: Marcelo Tosatti Return-path: Received: from mx1.redhat.com ([209.132.183.28]:35656 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755293AbZKDKty (ORCPT ); Wed, 4 Nov 2009 05:49:54 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA4Anxfr026551 for ; Wed, 4 Nov 2009 05:49:59 -0500 In-Reply-To: <1257331796-29722-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Avi Kivity --- qemu-kvm.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 809fd65..4b22537 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -869,6 +869,18 @@ int kvm_is_ready_for_interrupt_injection(CPUState *env) return env->kvm_run->ready_for_interrupt_injection; } +static int kvm_handle_internal_error(kvm_context_t kvm, + CPUState *env, + struct kvm_run *run) +{ + fprintf(stderr, "KVM internal error. Suberror: %d\n", + run->internal.suberror); + kvm_show_regs(env); + if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) + fprintf(stderr, "emulation failure, check dmesg for details\n"); + abort(); +} + int kvm_run(CPUState *env) { int r; @@ -967,12 +979,7 @@ int kvm_run(CPUState *env) break; #endif case KVM_EXIT_INTERNAL_ERROR: - fprintf(stderr, "KVM internal error. Suberror: %d\n", - run->internal.suberror); - kvm_show_regs(env); - if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) - fprintf(stderr, "emulation failure, check dmesg for details\n"); - abort(); + r = kvm_handle_internal_error(kvm, env, run); break; default: if (kvm_arch_run(env)) { -- 1.6.5.2