From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Leonard Subject: [PATCH ARM v7 02/13] mini-os: added HYPERVISOR_xsm_op Date: Fri, 8 Aug 2014 16:47:31 +0100 Message-ID: <1407512862-9373-3-git-send-email-talex5@gmail.com> References: <1407512862-9373-1-git-send-email-talex5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XFmaR-0001B0-6c for xen-devel@lists.xenproject.org; Fri, 08 Aug 2014 16:00:11 +0000 Received: by mail-wg0-f48.google.com with SMTP id x13so5835288wgg.7 for ; Fri, 08 Aug 2014 09:00:09 -0700 (PDT) In-Reply-To: <1407512862-9373-1-git-send-email-talex5@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Thomas Leonard , Dave.Scott@eu.citrix.com, anil@recoil.org, stefano.stabellini@eu.citrix.com, samuel.thibault@ens-lyon.org List-Id: xen-devel@lists.xenproject.org Avoids using _hypercall1 in events.c. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/events.c | 4 ++-- 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 48742de..2a23042 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 192b23cd..ee9050b 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -15,6 +15,7 @@ #include #include #include +#include #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 -- 2.0.3