Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[xen] Use generic test_and_clear_bit() function
Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Mar 16, 2016
1 parent 9bab13a commit c14971b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
19 changes: 0 additions & 19 deletions src/arch/x86/include/bits/xen.h
Expand Up @@ -161,23 +161,4 @@ xen_hypercall_5 ( struct xen_hypervisor *xen, unsigned int hypercall,
return retval;
}

/**
* Test and clear pending event
*
* @v xen Xen hypervisor
* @v port Event channel port
* @ret pending Event was pending
*/
static inline __attribute__ (( always_inline )) uint8_t
xenevent_pending ( struct xen_hypervisor *xen, evtchn_port_t port ) {
uint8_t pending;

__asm__ __volatile__ ( "lock btr %2, %0\n\t"
"setc %1\n\t"
: "+m" ( xen->shared->evtchn_pending ),
"=a" ( pending )
: "Ir" ( port ) );
return pending;
}

#endif /* _BITS_XEN_H */
14 changes: 14 additions & 0 deletions src/include/ipxe/xen.h
Expand Up @@ -13,6 +13,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#define __XEN_INTERFACE_VERSION__ 0x00040400

#include <stdint.h>
#include <ipxe/bitops.h>
#include <ipxe/uaccess.h>
#include <xen/xen.h>
#include <xen/event_channel.h>
Expand Down Expand Up @@ -58,6 +59,19 @@ struct xen_hypervisor {
struct xen_store store;
};

/**
* Test and clear pending event
*
* @v xen Xen hypervisor
* @v port Event channel port
* @ret pending Event was pending
*/
static inline __attribute__ (( always_inline )) int
xenevent_pending ( struct xen_hypervisor *xen, evtchn_port_t port ) {

return test_and_clear_bit ( port, xen->shared->evtchn_pending );
}

#include <bits/xen.h>

/**
Expand Down

0 comments on commit c14971b

Please sign in to comment.