From patchwork Fri Jun 11 11:30:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 105565 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5BBVkbr032330 for ; Fri, 11 Jun 2010 11:31:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757721Ab0FKLa6 (ORCPT ); Fri, 11 Jun 2010 07:30:58 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64598 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755400Ab0FKLa5 (ORCPT ); Fri, 11 Jun 2010 07:30:57 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id CA18717012A; Fri, 11 Jun 2010 19:30:49 +0800 (CST) Received: from 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 o5BBSTPx026915; Fri, 11 Jun 2010 19:28:29 +0800 Received: from [10.167.141.204] (unknown [10.167.141.204]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 1565410C007; Fri, 11 Jun 2010 19:30:31 +0800 (CST) Message-ID: <4C121E50.6050402@cn.fujitsu.com> Date: Fri, 11 Jun 2010 19:30:24 +0800 From: Lai Jiangshan User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti , kvm@vger.kernel.org, LKML Subject: [PATCH 1/2] kvm,ept: pass error code to handler 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.3 (demeter.kernel.org [140.211.167.41]); Fri, 11 Jun 2010 11:31:46 +0000 (UTC) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index c7565ea..6362dcc 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3470,7 +3470,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); trace_kvm_page_fault(gpa, exit_qualification); - return kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, 0); + return kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, exit_qualification); } static u64 ept_rsvd_mask(u64 spte, int level)