diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-07-19 12:51:11 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-20 15:41:30 +0100 |
| commit | 33daac3995d49d07fec245ea22f2c093fb11bec2 (patch) | |
| tree | 4eea955d9d0607e14db71d3dcd99332a9d5fe24a /xen/include/public | |
| parent | acf2d315202587e81bb7f3b6841dcfce2814415e (diff) | |
| download | xen-33daac3995d49d07fec245ea22f2c093fb11bec2.tar.gz xen-33daac3995d49d07fec245ea22f2c093fb11bec2.tar.bz2 xen-33daac3995d49d07fec245ea22f2c093fb11bec2.zip | |
xen: remove evtchn_upcall_mask from interface on ARM
On ARM event-channel upcalls are masked using the hardware's interrupt mask
bit and not by a software bit.
Leaving this field present in the interface has caused some confusion already
and is liable to mean it gets inadvertently used in the future. So arrange for
this field to be turned into a padding field on ARM by introducing a
XEN_HAVE_PV_UPCALL_MASK define.
This bit is also unused for x86 PV-on-HVM guests, but we can't realistically
distinguish those from x86 PV guests in the headers.
Add a per-arch vcpu_event_delivery_is_enabled function to replace an open
coded use of evtchn_upcall_mask in common code (in a debug keyhandler). The
existing local_event_delivery_is_enabled, which operates only on current, was
unimplemented on ARM and unused on x86, so remove it.
ifdef the use of evtchn_upcall_mask when setting up a new vcpu info page.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'xen/include/public')
| -rw-r--r-- | xen/include/public/arch-x86/xen.h | 2 | ||||
| -rw-r--r-- | xen/include/public/xen.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 7ae8c90489..908ef87f35 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -72,6 +72,8 @@ typedef unsigned long xen_pfn_t; #define XEN_HAVE_PV_GUEST_ENTRY 1 +#define XEN_HAVE_PV_UPCALL_MASK 1 + /* * `incontents 200 segdesc Segment Descriptor Tables */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 037540df45..2a409701fb 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -612,7 +612,11 @@ struct vcpu_info { * to block: this avoids wakeup-waiting races. */ uint8_t evtchn_upcall_pending; +#ifdef XEN_HAVE_PV_UPCALL_MASK uint8_t evtchn_upcall_mask; +#else /* XEN_HAVE_PV_UPCALL_MASK */ + uint8_t pad0; +#endif /* XEN_HAVE_PV_UPCALL_MASK */ xen_ulong_t evtchn_pending_sel; struct arch_vcpu_info arch; struct vcpu_time_info time; |