From: Tamas K Lengyel Date: Fri, 24 Jan 2020 13:56:21 +0000 (-0700) Subject: x86/mem_access: move _ve functions to x86 header X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~821 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=44d6e5b2d3c604e2603ab3a5c05d8dfb5b403e12;p=xen.git x86/mem_access: move _ve functions to x86 header These functions don't belong in the common mem_access header as there is no #VE equivalent on ARM. Signed-off-by: Tamas K Lengyel Acked-by: Jan Beulich --- diff --git a/xen/include/asm-x86/mem_access.h b/xen/include/asm-x86/mem_access.h index 99817a33db..a25e3c62df 100644 --- a/xen/include/asm-x86/mem_access.h +++ b/xen/include/asm-x86/mem_access.h @@ -46,6 +46,16 @@ bool p2m_mem_access_emulate_check(struct vcpu *v, /* Sanity check for mem_access hardware support */ bool p2m_mem_access_sanity_check(const struct domain *d); +int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, + unsigned int altp2m_idx); + +struct xen_hvm_altp2m_suppress_ve_multi; +int p2m_set_suppress_ve_multi(struct domain *d, + struct xen_hvm_altp2m_suppress_ve_multi *suppress_ve); + +int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, + unsigned int altp2m_idx); + #endif /*__ASM_X86_MEM_ACCESS_H__ */ /* diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h index 9dfebe6a29..0effa0caad 100644 --- a/xen/include/xen/mem_access.h +++ b/xen/include/xen/mem_access.h @@ -77,16 +77,6 @@ long p2m_set_mem_access_multi(struct domain *d, uint32_t nr, uint32_t start, uint32_t mask, unsigned int altp2m_idx); -int p2m_set_suppress_ve(struct domain *d, gfn_t gfn, bool suppress_ve, - unsigned int altp2m_idx); - -struct xen_hvm_altp2m_suppress_ve_multi; -int p2m_set_suppress_ve_multi(struct domain *d, - struct xen_hvm_altp2m_suppress_ve_multi *suppress_ve); - -int p2m_get_suppress_ve(struct domain *d, gfn_t gfn, bool *suppress_ve, - unsigned int altp2m_idx); - /* * Get access type for a gfn. * If gfn == INVALID_GFN, gets the default access type.