aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxc
diff options
context:
space:
mode:
authorXudong Hao <xudong.hao@intel.com>2012-05-30 11:38:41 +0100
committerXudong Hao <xudong.hao@intel.com>2012-05-30 11:38:41 +0100
commitc0e9f48077c9563a9d7f1146e7e585c7ec166df8 (patch)
treeb297d8807fb9de7ee739c9eb87176b94f0df0fc7 /tools/libxc
parent4a2504925d69d00073585a57eeb27de50466a852 (diff)
downloadxen-c0e9f48077c9563a9d7f1146e7e585c7ec166df8.tar.gz
xen-c0e9f48077c9563a9d7f1146e7e585c7ec166df8.tar.bz2
xen-c0e9f48077c9563a9d7f1146e7e585c7ec166df8.zip
Add instruction length and trap type in HVMOP_inject_trap.
Signed-off-by: Xudong Hao <xudong.hao@intel.com> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com> Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'tools/libxc')
-rw-r--r--tools/libxc/xc_misc.c7
-rw-r--r--tools/libxc/xenctrl.h3
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index a029d791ba..405e619d90 100644
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -602,7 +602,8 @@ int xc_hvm_get_mem_access(
}
int xc_hvm_inject_trap(
- xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code,
+ xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
+ uint32_t type, uint32_t error_code, uint32_t inslen,
uint64_t cr2)
{
DECLARE_HYPERCALL;
@@ -618,8 +619,10 @@ int xc_hvm_inject_trap(
arg->domid = dom;
arg->vcpuid = vcpu;
- arg->trap = trap;
+ arg->vector = vector;
+ arg->type = type;
arg->error_code = error_code;
+ arg->inslen = inslen;
arg->cr2 = cr2;
hypercall.op = __HYPERVISOR_hvm_op;
diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 3bbc8279ce..fe1431ac1b 100644
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -1578,7 +1578,8 @@ int xc_hvm_get_mem_access(
* resumes.
*/
int xc_hvm_inject_trap(
- xc_interface *xch, domid_t dom, int vcpu, uint32_t trap, uint32_t error_code,
+ xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
+ uint32_t type, uint32_t error_code, uint32_t inslen,
uint64_t cr2);
/*