diff options
| author | Daniel De Graaf <dgdegra@tycho.nsa.gov> | 2013-01-30 02:36:40 -0800 |
|---|---|---|
| committer | Daniel De Graaf <dgdegra@tycho.nsa.gov> | 2013-01-30 02:36:40 -0800 |
| commit | 6cf13d0d523e20557e11a94fda51452f54c3a1b5 (patch) | |
| tree | 94bb2e3ea61916df469ab5debbaab11db319a5a4 /xen/include/xsm | |
| parent | 66eb6f8b77474fcdd140e43f819a3a80fd5a25a8 (diff) | |
| download | xen-6cf13d0d523e20557e11a94fda51452f54c3a1b5.tar.gz xen-6cf13d0d523e20557e11a94fda51452f54c3a1b5.tar.bz2 xen-6cf13d0d523e20557e11a94fda51452f54c3a1b5.zip | |
xen/arch/arm: add XSM hook to HVMOP_{get,set}_param
This hook is not x86-specific; move it out of CONFIG_X86.
Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/xsm')
| -rw-r--r-- | xen/include/xsm/dummy.h | 10 | ||||
| -rw-r--r-- | xen/include/xsm/xsm.h | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 19bbe19415..025936a5a1 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -467,16 +467,16 @@ static XSM_INLINE int xsm_remove_from_physmap(XSM_DEFAULT_ARG struct domain *d1, return xsm_default_action(action, d1, d2); } -#ifdef CONFIG_X86 -static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) +static XSM_INLINE int xsm_hvm_param(XSM_DEFAULT_ARG struct domain *d, unsigned long op) { - XSM_ASSERT_ACTION(XSM_HOOK); + XSM_ASSERT_ACTION(XSM_TARGET); return xsm_default_action(action, current->domain, d); } -static XSM_INLINE int xsm_hvm_param(XSM_DEFAULT_ARG struct domain *d, unsigned long op) +#ifdef CONFIG_X86 +static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) { - XSM_ASSERT_ACTION(XSM_TARGET); + XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, d); } diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 2399da0a6d..cba744ce1a 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -129,9 +129,10 @@ struct xsm_operations { long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); + int (*hvm_param) (struct domain *d, unsigned long op); + #ifdef CONFIG_X86 int (*shadow_control) (struct domain *d, uint32_t op); - int (*hvm_param) (struct domain *d, unsigned long op); int (*hvm_set_pci_intx_level) (struct domain *d); int (*hvm_set_isa_irq_level) (struct domain *d); int (*hvm_set_pci_link_route) (struct domain *d); @@ -487,15 +488,15 @@ static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) return xsm_ops->do_xsm_op(op); } -#ifdef CONFIG_X86 -static inline int xsm_shadow_control (xsm_default_t def, struct domain *d, uint32_t op) +static inline int xsm_hvm_param (xsm_default_t def, struct domain *d, unsigned long op) { - return xsm_ops->shadow_control(d, op); + return xsm_ops->hvm_param(d, op); } -static inline int xsm_hvm_param (xsm_default_t def, struct domain *d, unsigned long op) +#ifdef CONFIG_X86 +static inline int xsm_shadow_control (xsm_default_t def, struct domain *d, uint32_t op) { - return xsm_ops->hvm_param(d, op); + return xsm_ops->shadow_control(d, op); } static inline int xsm_hvm_set_pci_intx_level (xsm_default_t def, struct domain *d) |