diff options
| author | Thomas Leonard <talex5@gmail.com> | 2014-08-08 16:47:31 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-09-08 12:15:27 +0100 |
| commit | 2903df843007e267a489a48f1c6ab03f7ea1d09a (patch) | |
| tree | ad7db7eb2263756de7a0445ebf6fb9f70f9b1aab /extras | |
| parent | a80e7d0d392076a0466cc3a1476aeb24182401de (diff) | |
mini-os: added HYPERVISOR_xsm_op
Avoids using _hypercall1 in events.c.
Signed-off-by: Thomas Leonard <talex5@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/events.c | 4 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/os.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 48742de8ee..2a23042ec9 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -245,7 +245,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.cmd = FLASK_GET_PEER_SID; op.interface_version = XEN_FLASK_INTERFACE_VERSION; op.u.peersid.evtchn = local_port; - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); if (rc) return rc; sid = op.u.peersid.sid; @@ -253,7 +253,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.u.sid_context.sid = sid; op.u.sid_context.size = size; set_xen_guest_handle(op.u.sid_context.context, ctx); - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); return rc; } diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 192b23cd2b..ee9050bf26 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -15,6 +15,7 @@ #include <mini-os/types.h> #include <mini-os/hypervisor.h> #include <mini-os/kernel.h> +#include <xen/xsm/flask_op.h> #define USED __attribute__ ((used)) @@ -558,6 +559,12 @@ static __inline__ int synch_var_test_bit(int nr, volatile void * addr) synch_const_test_bit((nr),(addr)) : \ synch_var_test_bit((nr),(addr))) +static inline int +HYPERVISOR_xsm_op( + struct xen_flask_op *op) +{ + return _hypercall1(int, xsm_op, op); +} #undef ADDR |