Joe Epstein
2011-Jan-06 03:53 UTC
[Xen-devel] [PATCH 6 of 7] REDO2: mem_access & mem_access 2: added trap injection to libxc
* Carries forward the trap injection hypercall into libxc Signed-off-by: Joe Epstein <jepstein98@gmail.com> diff -r cfe66eacb934 -r 9b0f278f919a tools/libxc/xc_misc.c --- a/tools/libxc/xc_misc.c Wed Jan 05 19:03:41 2011 -0800 +++ b/tools/libxc/xc_misc.c Wed Jan 05 19:05:50 2011 -0800 @@ -572,6 +572,38 @@ int xc_hvm_get_mem_access( return rc; } +int xc_hvm_inject_trap( + xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code, + uint64_t cr2) +{ + DECLARE_HYPERCALL; + DECLARE_HYPERCALL_BUFFER(struct xen_hvm_inject_trap, arg); + int rc; + + arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg)); + if ( arg == NULL ) + { + PERROR("Could not allocate memory for xc_hvm_inject_trap hypercall"); + return -1; + } + + arg->domid = dom; + arg->vcpuid = vcpu; + arg->trap = trap; + arg->error_code = error_code; + arg->cr2 = cr2; + + hypercall.op = __HYPERVISOR_hvm_op; + hypercall.arg[0] = HVMOP_inject_trap; + hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); + + rc = do_xen_hypercall(xch, &hypercall); + + xc_hypercall_buffer_free(xch, arg); + + return rc; +} + /* * Local variables: * mode: C diff -r cfe66eacb934 -r 9b0f278f919a tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Wed Jan 05 19:03:41 2011 -0800 +++ b/tools/libxc/xenctrl.h Wed Jan 05 19:05:50 2011 -0800 @@ -1426,6 +1426,14 @@ int xc_hvm_get_mem_access( xc_interface *xch, domid_t dom, uint64_t pfn, hvmmem_access_t* memaccess); /* + * Injects a hardware/software CPU trap, to take effect the next time the HVM + * resumes. + */ +int xc_hvm_inject_trap( + xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code, + uint64_t cr2); + +/* * LOGGING AND ERROR REPORTING */ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Campbell
2011-Jan-06 09:55 UTC
Re: [Xen-devel] [PATCH 6 of 7] REDO2: mem_access & mem_access 2: added trap injection to libxc
On Thu, 2011-01-06 at 03:53 +0000, Joe Epstein wrote:> * Carries forward the trap injection hypercall into libxc > > Signed-off-by: Joe Epstein <jepstein98@gmail.com>Acked-by: Ian Campbell <Ian.Campbell@citrix.com> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel