From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xudong Hao Subject: [PATCH v2 3/4] xen: Add instruction length parameter in hypercall HVMOP_inject_trap Date: Wed, 30 May 2012 10:35:47 +0800 Message-ID: <1338345347-22433-4-git-send-email-xudong.hao@intel.com> References: <1338345347-22433-1-git-send-email-xudong.hao@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1338345347-22433-1-git-send-email-xudong.hao@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: JBeulich@suse.com, keir.xen@gmail.com Cc: aravindh@virtuata.com, eddie.dong@intel.com, xen-devel@lists.xen.org, Xudong Hao , Ian.Jackson@eu.citrix.com, Xiantao Zhang List-Id: xen-devel@lists.xenproject.org Add parameter inslen for hypercall HVMOP_inject_trap, supply interface used by passing instruction length from userspace. Signed-off-by: Xudong Hao Signed-off-by: Xiantao Zhang --- xen/arch/x86/hvm/hvm.c | 1 + xen/include/public/hvm/hvm_op.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f3c87bc..2921e9e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4290,6 +4290,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) else { v->arch.hvm_vcpu.inject_trap.vector = tr.trap; + v->arch.hvm_vcpu.inject_trap.inslen = tr.inslen; v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code; v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2; } diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index 6a78f75..4eccc85 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -221,6 +221,8 @@ struct xen_hvm_inject_trap { uint32_t trap; /* Error code, or -1 to skip */ uint32_t error_code; + /* Intruction length */ + uint32_t inslen; /* CR2 for page faults */ uint64_aligned_t cr2; }; -- 1.5.5