@@ -4332,23 +4332,20 @@ static int replace_grant_p2m_mapping(
return GNTST_okay;
}
-int replace_grant_host_mapping(
- uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags)
+static int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
+ uint64_t new_addr, unsigned int flags)
{
struct vcpu *curr = current;
l1_pgentry_t *pl1e, ol1e;
unsigned long gl1mfn;
struct page_info *l1pg;
int rc;
-
- if ( paging_mode_external(current->domain) )
- return replace_grant_p2m_mapping(addr, frame, new_addr, flags);
if ( flags & GNTMAP_contains_pte )
{
if ( !new_addr )
return destroy_grant_pte_mapping(addr, frame, curr->domain);
-
+
return GNTST_general_error;
}
@@ -4408,6 +4405,15 @@ int replace_grant_host_mapping(
return rc;
}
+int replace_grant_host_mapping(uint64_t addr, unsigned long frame,
+ uint64_t new_addr, unsigned int flags)
+{
+ if ( paging_mode_external(current->domain) )
+ return replace_grant_p2m_mapping(addr, frame, new_addr, flags);
+
+ return replace_grant_pv_mapping(addr, frame, new_addr, flags);
+}
+
int donate_page(
struct domain *d, struct page_info *page, unsigned int memflags)
{
We will later split out PV specific code to pv/mm.c. No functional change. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- xen/arch/x86/mm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)