[PATCH 6 of 6] REDO: mem_access & mem_access 2: added trap injection to libxc

* [PATCH 6 of 6] REDO: mem_access & mem_access 2: added trap injection to libxc
@ 2011-01-04 22:07 Joe Epstein
  2011-01-05 14:41 ` Tim Deegan
  0 siblings, 1 reply; 5+ messages in thread
From: Joe Epstein @ 2011-01-04 22:07 UTC (permalink / raw)
  To: xen-devel

* Carries forward the trap injection hypercall into libxc

Signed-off-by: Joe Epstein <jepstein98@gmail.com>

diff -r c1866aff7a5f -r 137a70154bdc tools/libxc/xc_misc.c

--- a/tools/libxc/xc_misc.c	Tue Jan 04 12:35:49 2011 -0800
+++ b/tools/libxc/xc_misc.c	Tue Jan 04 12:46:03 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 c1866aff7a5f -r 137a70154bdc tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h	Tue Jan 04 12:35:49 2011 -0800
+++ b/tools/libxc/xenctrl.h	Tue Jan 04 12:46:03 2011 -0800
@@ -1413,6 +1413,14 @@
     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
  */

^ permalink raw reply	[flat|nested] 5+ messages in thread