x86/mem_access: move _ve functions to x86 header

[Xen-devel] [PATCH] x86/mem_access: move _ve functions to x86 header

Posted by Tamas K Lengyel 4 years, 2 months ago

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 <tamas@tklengyel.com>
---
 xen/include/asm-x86/mem_access.h | 10 ++++++++++
 xen/include/xen/mem_access.h     | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

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.
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] x86/mem_access: move _ve functions to x86 header

Posted by Andrew Cooper 4 years, 2 months ago

On 24/01/2020 13:56, Tamas K Lengyel wrote:
> 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 <tamas@tklengyel.com>

Thanks for the patch, but Jan has already committed the more simple
build fix.  Can you rebase this on staging?

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] x86/mem_access: move _ve functions to x86 header

Posted by Tamas K Lengyel 4 years, 2 months ago

On Fri, Jan 24, 2020 at 6:57 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> On 24/01/2020 13:56, Tamas K Lengyel wrote:
> > 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 <tamas@tklengyel.com>
>
> Thanks for the patch, but Jan has already committed the more simple
> build fix.  Can you rebase this on staging?
>

It is based on staging.

Tamas

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] x86/mem_access: move _ve functions to x86 header

Posted by Andrew Cooper 4 years, 2 months ago

On 24/01/2020 13:59, Tamas K Lengyel wrote:
> On Fri, Jan 24, 2020 at 6:57 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>> On 24/01/2020 13:56, Tamas K Lengyel wrote:
>>> 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 <tamas@tklengyel.com>
>> Thanks for the patch, but Jan has already committed the more simple
>> build fix.  Can you rebase this on staging?
>>
> It is based on staging.

Oh.  My apologies.  I was naively assuming that the second forward
declaration would go as well, but I see that won't work.

~Andrew

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] x86/mem_access: move _ve functions to x86 header

Posted by Jan Beulich 4 years, 2 months ago

On 24.01.2020 14:56, Tamas K Lengyel wrote:
> 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 <tamas@tklengyel.com>

Acked-by: Jan Beulich <jbeulich@suse.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel