From patchwork Thu Mar 8 08:04:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 145462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 492FFB6EE8 for ; Thu, 8 Mar 2012 19:03:32 +1100 (EST) Received: from localhost ([::1]:51208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5YJu-00082o-1m for incoming@patchwork.ozlabs.org; Thu, 08 Mar 2012 03:03:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:47962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5YJg-00082T-OU for qemu-devel@nongnu.org; Thu, 08 Mar 2012 03:03:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5YJD-0006YR-Sd for qemu-devel@nongnu.org; Thu, 08 Mar 2012 03:03:16 -0500 Received: from [222.73.24.84] (port=12990 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5YJD-0006Y7-HK for qemu-devel@nongnu.org; Thu, 08 Mar 2012 03:02:47 -0500 X-IronPort-AV: E=Sophos;i="4.73,551,1325433600"; d="scan'208";a="4488979" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 08 Mar 2012 16:02:40 +0800 Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q2882hBP022020; Thu, 8 Mar 2012 16:02:43 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2012030816004684-928559 ; Thu, 8 Mar 2012 16:00:46 +0800 Message-ID: <4F58680C.2070007@cn.fujitsu.com> Date: Thu, 08 Mar 2012 16:04:28 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov References: <4F58664D.1070800@cn.fujitsu.com> In-Reply-To: <4F58664D.1070800@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-08 16:00:46, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-08 16:00:48, Serialize complete at 2012-03-08 16:00:48 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH 2/2 v3] kvm: set exit_reason to KVM_EXIT_GUEST_PANICKED when guest panicked X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch introduces new request bit KVM_REQ_GUEST_PANICEKD. If this bit is set, set vcpu's exit_reason to KVM_EXIT_GUEST_PANICKED. And then the user space can know the guest panicked. Signed-off-by: Wen Congyang --- arch/x86/kvm/x86.c | 11 +++++++++++ include/linux/kvm.h | 1 + include/linux/kvm_host.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c9d99e5..978e398 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5013,6 +5013,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) case KVM_HC_VAPIC_POLL_IRQ: ret = 0; break; + case KVM_HC_GUEST_PANICKED: + ret = 0; + kvm_make_request(KVM_REQ_GUEST_PANICKED, vcpu); + break; default: ret = -KVM_ENOSYS; break; @@ -5228,6 +5232,13 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) r = 0; goto out; } + + if (kvm_check_request(KVM_REQ_GUEST_PANICKED, vcpu)) { + vcpu->run->exit_reason = KVM_EXIT_GUEST_PANICKED; + r = 0; + goto out; + } + if (kvm_check_request(KVM_REQ_DEACTIVATE_FPU, vcpu)) { vcpu->fpu_active = 0; kvm_x86_ops->fpu_deactivate(vcpu); diff --git a/include/linux/kvm.h b/include/linux/kvm.h index acbe429..a46052e 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -163,6 +163,7 @@ struct kvm_pit_config { #define KVM_EXIT_OSI 18 #define KVM_EXIT_PAPR_HCALL 19 #define KVM_EXIT_S390_UCONTROL 20 +#define KVM_EXIT_GUEST_PANICKED 21 /* For KVM_EXIT_INTERNAL_ERROR */ #define KVM_INTERNAL_ERROR_EMULATION 1 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 355e445..026bbe5 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -54,6 +54,7 @@ #define KVM_REQ_IMMEDIATE_EXIT 15 #define KVM_REQ_PMU 16 #define KVM_REQ_PMI 17 +#define KVM_REQ_GUEST_PANICKED 18 #define KVM_USERSPACE_IRQ_SOURCE_ID 0