Joe Epstein
2011-Jan-02 22:14 UTC
[Xen-devel] [PATCH 3 of 3] mem_access changes: trap injection
Adds the ability to inject traps through HVM. NOTE: the included patches are based on a previous patch series from me on Dec 28th, purely for readability. To apply the patches to the repository, see the attached patch on the PATCH 0 of 3 email. Signed-off-by: Joe Epstein <jepstein98@gmail.com> diff -r 1535fee95f47 tools/libxc/xc_misc.c --- a/tools/libxc/xc_misc.c Sun Jan 02 13:19:51 2011 -0800 +++ b/tools/libxc/xc_misc.c Sun Jan 02 13:20:04 2011 -0800 @@ -572,6 +572,38 @@ 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 1535fee95f47 tools/libxc/xenctrl.h --- a/tools/libxc/xenctrl.h Sun Jan 02 13:19:51 2011 -0800 +++ b/tools/libxc/xenctrl.h Sun Jan 02 13:20:04 2011 -0800 @@ -1412,6 +1412,13 @@ 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 lists.xensource.com/xen-devel